X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scanlib.pm;h=b1ef13a308f47fd1b47e9c6215228b7faeb29b29;hb=ee367581883b881d262b317916e1511cbc794f53;hp=1550007cb26fcc77c722704df54ba18976a7e896;hpb=a56dfd870271c1aa46516ced24f5b2b2667024e5;p=bugscan.git

diff --git a/scanlib.pm b/scanlib.pm
index 1550007..b1ef13a 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,11 +371,13 @@ 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);
 
+	if (length($bug->{'done'}) and
+	    (not @sourceversions or not @{$bug->{'fixed_versions'}})) {
+		return 'done';
+	}
 	if (@sourceversions) {
 		my $max_buggy = Debbugs::Status::max_buggy(bug => $bugnr,
 			 sourceversions => \@sourceversions,
@@ -383,18 +385,12 @@ sub get_status() {
 		 	 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 ($max_buggy eq 'absent' || $max_buggy eq 'fixed') {
+			return $max_buggy;
 		}
 	}
-	if (length($bug{'done'}) and
-	    (not @sourceversions or not @{$status{'fixed_versions'}})) {
-		$status = 'done';
-	}
 
-	return $status;
+	return 'pending';
 }
 
 sub check_worry {