X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=068b9b4fbc6e07e95469a7ed2c1b8dde3b261975;hp=460e269b2684587ca727f47cad572c22d33e9ede;hb=a0159341c72ebaf4df5d7603a6e7c56e0320b559;hpb=b59d39395922f188de13d3b594818d6781c5e6da diff --git a/scanlib.pm b/scanlib.pm index 460e269..068b9b4 100644 --- a/scanlib.pm +++ b/scanlib.pm @@ -225,11 +225,11 @@ sub scanspooldir() { $status_experimental = get_status($f, $bug, 'experimental') if ($experimental_tag); $relinfo = ""; - $relinfo .= (($oldstable_tag && $status_oldstable->{'pending'} eq 'pending') ? "O" : ""); - $relinfo .= (($stable_tag && $status_stable->{'pending'} eq 'pending') ? "S" : ""); - $relinfo .= (($testing_tag && $status_testing->{'pending'} eq 'pending') ? "T" : ""); - $relinfo .= (($unstable_tag && $status_unstable->{'pending'} eq 'pending') ? "U" : ""); - $relinfo .= (($experimental_tag && $status_experimental->{'pending'} eq 'pending') ? "E" : ""); + $relinfo .= (($oldstable_tag && $status_oldstable eq 'pending') ? "O" : ""); + $relinfo .= (($stable_tag && $status_stable eq 'pending') ? "S" : ""); + $relinfo .= (($testing_tag && $status_testing eq 'pending') ? "T" : ""); + $relinfo .= (($unstable_tag && $status_unstable eq 'pending') ? "U" : ""); + $relinfo .= (($experimental_tag && $status_experimental eq 'pending') ? "E" : ""); next if $relinfo eq '' and not $premature{$f}; $premature{$f}++ if $relinfo eq ''; @@ -371,15 +371,30 @@ my $_version_cache = {}; sub get_status() { my ($bugnr, $bug, $dist) = @_; + my $status = 'pending'; + my @versions = Debbugs::Status::getversions($bug->{'package'}, $dist, undef); my @sourceversions = Debbugs::Status::makesourceversions($bug->{'package'}, undef, @versions); - return Debbugs::Status::max_buggy(bug => $bugnr, + if (@sourceversions) { + my $max_buggy = Debbugs::Status::max_buggy(bug => $bugnr, sourceversions => \@sourceversions, found => $bug->{'found_versions'}, fixed => $bug->{'fixed_versions'}, version_cache => $_version_cache, package => $bug->{'package'}); + if ($max_buggy eq 'absent') { + $status = 'absent'; + } elsif ($max_buggy eq 'fixed') { + $status = 'done'; + } + } + if (length($bug->{'done'}) and + (not @sourceversions or not @{$bug->{'fixed_versions'}})) { + $status = 'done'; + } + + return $status; } sub check_worry {