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

tweak it a bit to ignore changes in number of generated info files.

Browse Source
This commit is contained in:
espie 2006-07-12 08:11:28 +00:00
parent 1a4c5a71ab
commit 7d211a2885
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
infrastructure/package/register-plist
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl #! /usr/bin/perl
# $OpenBSD: register-plist,v 1.7 2006/02/09 12:03:55 espie Exp $ # $OpenBSD: register-plist,v 1.8 2006/07/12 08:11:28 espie Exp $
# Copyright (c) 2005 # Copyright (c) 2005
# Marc Espie. All rights reserved. # Marc Espie. All rights reserved.
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -175,10 +175,7 @@ sub my_compare
my $final = 0; my $final = 0;
$p->visit('flatten', $l); $p->visit('flatten', $l);
$p2->visit('flatten', $l2); $p2->visit('flatten', $l2);
if (@$l != @$l2) { while (my $e = shift @$l) {
return 1;
}
for my $e (@$l) {
my $e2 = shift @$l2; my $e2 = shift @$l2;
my $r = $e->compare($e2); my $r = $e->compare($e2);
if ($r == 1) { if ($r == 1) {
@ -187,6 +184,23 @@ sub my_compare
if ($r == 2) { if ($r == 2) {
$final = 2; $final = 2;
} }
# zap info-* files from compared stuff.
if ($e->isa("OpenBSD::PackingElement::InfoFile")) {
my $stem = $e->{name};
my ($i, $j);
for ($i = 1; $l->[0]->{name} eq "$stem-$i"; $i++) {
shift @$l;
}
for ($j = 1; $l2->[0]->{name} eq "$stem-$j"; $j++) {
shift @$l2;
}
if ($i != $j) {
$final = 2;
}
}
}
if (@$l2 > 0) {
return 1;
} }
return $final; return $final;
} }