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

make sure all hosts have the same set of .la files

Browse Source
This commit is contained in:
espie 2010-05-06 15:50:13 +00:00
parent b4bbdfffe3
commit 56e02d3495
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
infrastructure/build/DPB/Signature.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4: # ex:ts=8 sw=4:
# $OpenBSD: Signature.pm,v 1.7 2010/05/04 09:45:41 espie Exp $ # $OpenBSD: Signature.pm,v 1.8 2010/05/06 15:50:13 espie Exp $
# #
# Copyright (c) 2010 Marc Espie <espie@openbsd.org> # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
# #
@ -40,6 +40,7 @@ sub compare1
my ($s1, $s2, $h1, $h2) = @_; my ($s1, $s2, $h1, $h2) = @_;
my $r = ''; my $r = '';
while (my ($stem, $lib) = each %$s1) { while (my ($stem, $lib) = each %$s1) {
next if $stem eq 'la';
if (!defined $s2->{$stem}) { if (!defined $s2->{$stem}) {
$r .= "Can't find ".$lib->to_string." on $h2\n"; $r .= "Can't find ".$lib->to_string." on $h2\n";
} elsif ($s2->{$stem}->to_string ne $lib->to_string) { } elsif ($s2->{$stem}->to_string ne $lib->to_string) {
@ -48,6 +49,11 @@ sub compare1
$lib->to_string. " on $h1\n"; $lib->to_string. " on $h1\n";
} }
} }
for my $k (keys %{$s1->{la}}) {
if (!defined $s2->{la}{$k}) {
$r .= "$h2 does not have $k.la (from $h1)\n";
}
}
return $r; return $r;
} }
@ -83,10 +89,14 @@ sub process
my $fh = $core->fh; my $fh = $core->fh;
my $repo = $self->{repo}; my $repo = $self->{repo};
while (<$fh>) { while (<$fh>) {
if ($_ =~ m/(.*).la/) {
$repo->{la}->{$1} = 1;
} else {
my $lib = OpenBSD::Library->from_string("$self->{dir}/$_"); my $lib = OpenBSD::Library->from_string("$self->{dir}/$_");
next unless $lib->is_valid; next unless $lib->is_valid;
$repo->best($lib); $repo->best($lib);
} }
}
} }
package DPB::Signature; package DPB::Signature;