X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lib%2FWB%2FQD.pm;h=015f8a42afd5c14c8a77d587986ba140a0612231;hb=02f1b46508fd108abdd32cf2c799c813da7fd5de;hp=6a1a067ba9bb110c2f9b5702f3d3b99f4eabf226;hpb=60ef83024a2b290ab1a92f103e5de52aa909a7a3;p=wannabuild.git diff --git a/lib/WB/QD.pm b/lib/WB/QD.pm index 6a1a067..015f8a4 100644 --- a/lib/WB/QD.pm +++ b/lib/WB/QD.pm @@ -47,11 +47,9 @@ sub readsourcebins { /^Build-Conflicts:\s*(.*)$/mi and $p->{'conflicts'} = $1; next unless $p->{'name'} and $p->{'version'}; - next if $p->{'arch'} eq 'all'; foreach my $tarch (split(/\s+/, $p->{'arch'})) { $p->{'for-us'} = 1 if debarch_is($arch, $tarch); } - delete $p->{'arch'}; # ignore if package already exists with higher version if ($srcs->{$p->{'name'}}) { @@ -113,9 +111,13 @@ sub readsourcebins { } delete $srcs->{$k}->{'for-us'}; - #my $p = $pas->{$k}; - #$p ||= $pas->{'%'.$k}; - #$srcs->{$k}->{'status'} = 'not-for-us' if pasignore($p, $arch); + if ($srcs->{$k}->{'arch'} eq 'all') { + $srcs->{$k}->{'status'} = 'arch-all-only'; + delete $srcs->{$k}->{'arch'}; + next; + } + delete $srcs->{$k}->{'arch'}; + if (pasignore($pas->{'%'.$k}, $arch)) { $srcs->{$k}->{'status'} = 'packages-arch-specific'; next;