summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2012-06-20 13:20:09 +0200
committerMichael Schroeder <mls@suse.de>2012-06-20 13:20:09 +0200
commit76c19e6d433153bb2d31941449f867879f5e9cf6 (patch)
treee9e5dcfe2d06704de55955b7433040bab702768c
parent106a3de0fe9980130c83dd29ab43177bd9d2f3a9 (diff)
downloadbuild-76c19e6d433153bb2d31941449f867879f5e9cf6.tar.gz
build-76c19e6d433153bb2d31941449f867879f5e9cf6.tar.bz2
build-76c19e6d433153bb2d31941449f867879f5e9cf6.zip
- ignore empty packages when ordering (instead of dieing)
-rwxr-xr-xorder4
1 files changed, 4 insertions, 0 deletions
diff --git a/order b/order
index 17c483d..6682fd6 100755
--- a/order
+++ b/order
@@ -61,6 +61,10 @@ for my $p (@p) {
my $q;
for my $suf ('rpm', 'deb', 'arch') {
next unless -f "$cachedir/$p.$suf";
+ if (! -s "$cachedir/$p.$suf") {
+ $q = {'provides' => [], 'requires' => []}; # package from preinstallimage, no need to order
+ last;
+ }
$q = Build::query("$cachedir/$p.$suf", 'filelist' => 1, 'alldeps' => 1);
die("bad binary: $p.$suf\n") unless $q;
push @{$q->{'provides'}}, @{$q->{'filelist'}} if $suf eq 'rpm' && $q->{'filelist'};