Skip to content

Commit

Permalink
[backend] accept patchinfos as excluded when all other packages are d…
Browse files Browse the repository at this point in the history
…isabled
  • Loading branch information
adrianschroeter committed Jul 9, 2015
1 parent 70a24f2 commit 69dd947
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/backend/bs_sched
Original file line number Diff line number Diff line change
Expand Up @@ -5587,6 +5587,7 @@ sub checkpatchinfo {
my %metas;
my $empty_channel_seen;
my $rpms_seen;
my $enabled_seen;
for my $arch (@archs) {
if ($arch eq $myarch) {
$apackstatus = $ctx->{'packstatus'};
Expand All @@ -5601,9 +5602,8 @@ sub checkpatchinfo {
my $blockedarch;
for my $apackid (@packages) {
my $code = $apackstatus->{$apackid} || '';
if ($code eq 'excluded') {
next;
}
next if $code eq 'excluded';
$enabled_seen = 1 unless $code eq 'disabled';
if ($code ne 'done' && $code ne 'disabled') {
$blockedarch = 1;
push @blocked, "$arch/$apackid";
Expand Down Expand Up @@ -5671,9 +5671,8 @@ sub checkpatchinfo {
return ('blocked', join(', ', @blocked));
}

if ($empty_channel_seen && !$rpms_seen) {
return ('excluded', 'no binary in channel');
}
return ('excluded', 'no binary in channel') if ($empty_channel_seen && !$rpms_seen);
return ('excluded', 'no package enabled') unless $enabled_seen;

return ('broken', 'no binaries found') unless @tocopy;

Expand Down

0 comments on commit 69dd947

Please sign in to comment.