X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=c3e12709ee15b210219e559dbf30e9b8a927880a;hp=2b905c43996d3991c1710e09e1569c5d03757c38;hb=6112a4e4f7e373a1852b98ade92676c4aff73385;hpb=038c6aa61e809657e74971f8fe72a56fe57551a7

diff --git a/scanlib.pm b/scanlib.pm
index 2b905c4..c3e1270 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -14,7 +14,7 @@
 #   %packagelist    - map from packagename to bugreports
 #   %NMU            - map with NMU information
 
-use lib qw(/org/bugs.debian.org/perl/);
+use lib qw(/org/bugs.debian.org/perl);
 use LWP::UserAgent;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Packages;
@@ -208,33 +208,43 @@ sub scanspooldir() {
 			}
 		}
 		next if $skip==1;
-		
-		my $oldstable_tag    = grep(/^woody$/, @tags);
-		my $stable_tag       = grep(/^sarge$/, @tags);
-		my $testing_tag      = grep(/^etch$/, @tags);
-		my $unstable_tag     = grep(/^sid$/, @tags);
-		my $experimental_tag = grep(/^experimental$/, @tags);
+	
+		my %disttags = ();	
+		$disttags{'oldstable'}    = grep(/^woody$/, @tags);
+		$disttags{'stable'}       = grep(/^sarge$/, @tags);
+		$disttags{'testing'}      = grep(/^etch$/, @tags);
+		$disttags{'unstable'}     = grep(/^sid$/, @tags);
+		$disttags{'experimental'} = grep(/^experimental$/, @tags);
 
 		# default according to dondelelcaro 2006-11-11
-		if (!$oldstable_tag && !$stable_tag && !$testing_tag && !$unstable_tag && !$experimental_tag) {
-			$testing_tag = 1;
-			$unstable_tag = 1;
-			$experimental_tag = 1;
+		if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+			$disttags{'testing'} = 1;
+			$disttags{'unstable'} = 1;
+			$disttags{'experimental'} = 1;
 		}
 
 		# only bother to check the versioning status for the distributions indicated by the tags 
-		my $status_oldstable    = get_status($f, $bug, 'oldstable')    if ($oldstable_tag);
-		my $status_stable       = get_status($f, $bug, 'stable')       if ($stable_tag);
-		my $status_testing      = get_status($f, $bug, 'testing')      if ($testing_tag);
-		my $status_unstable     = get_status($f, $bug, 'unstable')     if ($unstable_tag);
-		my $status_experimental = get_status($f, $bug, 'experimental') if ($experimental_tag);
-
 		my $relinfo = "";
-		$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" : "");
+		for my $dist qw(oldstable stable testing unstable experimental) {
+			local $SIG{__WARN__} = sub {};
+
+			next if (!$disttags{$dist});
+
+			my $presence = Debbugs::Status::bug_presence(
+				bug => $f, 
+				status => $bug, 
+				dist => $dist, 
+				arch => [ qw(alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc) ]
+			);
+
+			# ignore bugs that are absent/fixed in this distribution, include everything
+			# else (that is, "found" which says that the bug is present, and undef, which
+			# indicates that no versioning information is present and it's not closed
+			# unversioned)
+			if (!defined($presence) || ($presence ne 'absent' && $presence ne 'fixed')) {
+				$relinfo .= uc(substr($dist, 0, 1));
+			}
+		}
 		
 		next if $relinfo eq '' and not $premature{$f};
 		$premature{$f}++ if $relinfo eq '';
@@ -297,6 +307,7 @@ sub readstatus() {
 			push @{$packagelist{$pkg}}, $bug;
 		} else {
 			($pkg,$sect, $mnt)=split(/ /, $_, 3);
+			next if (!defined($pkg));
 			$section{$pkg}=$sect;
 			$maintainer{$pkg}=$mnt;
 		}
@@ -372,32 +383,6 @@ sub wwwname() {
 #	"<A HREF=\"${btsURL}/db/pa/l$name.html\">$name</A>";
 }
 
-my $_version_cache = {};
-sub get_status() {
-	my ($bugnr, $bug, $dist) = @_;
-
-	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,
-		 	 found => $bug->{'found_versions'},
-		 	 fixed => $bug->{'fixed_versions'},
-			 version_cache => $_version_cache,
-			 package => $bug->{'package'});
-		if ($max_buggy eq 'absent' || $max_buggy eq 'fixed') {
-			return $max_buggy;
-		}
-	}
-
-	return 'pending';
-}
-
 sub check_worry {
 	my ($status) = @_;
 
@@ -408,3 +393,5 @@ sub check_worry {
 	}
 	return 1;
 }
+
+1;