cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no longer ignore @version, but do something smarter about it.

Browse Source 
- if it wasn't there, just register it
- if it was there, don't allow it to go backwards
- when @version increases, anything goes. The new plist might have some
new objects, we don't really care.

as requested by sthen@
makes it possible to avoid REVISION bumps for large system changes (such
as gcc 4.9 -> 8.*)

it is advised to do a bulk with the newer register-plist first so that the
lists will have @version markers
This commit is contained in:
espie 2019-04-21 13:06:35 +00:00
parent 1d68988338
commit 977cb19749
1 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
infrastructure/bin/register-plist
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl
# $OpenBSD: register-plist,v 1.16 2017/09/18 13:01:43 espie Exp $
# $OpenBSD: register-plist,v 1.17 2019/04/21 13:06:35 espie Exp $
# Copyright (c) 2005,2012
# Marc Espie. All rights reserved.
# Redistribution and use in source and binary forms, with or without
@ -47,9 +47,6 @@ sub forget_details
undef $self->{"digital-signature"};
undef $self->{vendor};
undef $self->{signer};
# XXX for now we forget version because it can be there or not
# this is not accurate, but simple
undef $self->{version};
my $l = $self->{items};
if ($l->[@$l-1]->isa('OpenBSD::PackingElement::Cwd') &&
@ -75,6 +72,8 @@ sub forget_details
{
}
# packing-lists in packages have more info (symlinks) that we can't
# reproduce when we test packing-lists from source
sub forget_more_details
{
}
@ -120,6 +119,29 @@ sub flatten
{
}
package OpenBSD::PackingElement::Version;
sub compare
{
my ($self, $self2) = @_;
if (ref($self) ne ref($self2)) {
return 1;
}
# no version element in #2, let's mogrify
if ($self2->name == -1) {
return 2;
}
if ($self->name == $self2->name) {
return 0;
}
# versions shouldn't ever go back
if ($self->name < $self2->name) {
return 1;
}
# special case: no need for further compare
# this is a full replacement
return 3;
}
package OpenBSD::PackingElement::Old;
sub flatten
{
@ -369,9 +391,20 @@ sub compare
package main;
# my_compare is asymetric $p is always the newer list
sub my_compare
{
my ($p, $p2, $state) = @_;
# back compatibility: if the old list doesn't have a version
# marker, let's put a -1 there
if (!defined $p2->{version}) {
OpenBSD::PackingElement::Version->add($p2, "-1");
}
# ... and actually put a 0 in the new one, for arch-independent
# packages
if (!defined $p->{version}) {
OpenBSD::PackingElement::Version->add($p, "0");
}
my $l = [];
my $l2 = [];
my $final = 0;
@ -384,6 +417,12 @@ sub my_compare
if ($r == 1) {
return $r;
}
if ($r == 3) {
push(@{$state->{updates}}, [$e2, $e]);
# don't bother doing more comparisons, there's
# no need
return 2;
}
if ($r == 2) {
push(@{$state->{updates}}, [$e2, $e]);
$state->{mogrified}{$e} = $e2;
@ -439,8 +478,8 @@ sub act_on_compare
$state->errsay("#1 was updated", $result);
for my $i (@{$state->{updates}}) {
$state->errsay("#1 -> #2",
$i->[0]->stringize,
$i->[1]->stringize);
$i->[0]->fullstring,
$i->[1]->fullstring);
}
}
return 0;