X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=d8d04671369170e199864544ebb1dd4b634521a4;hp=8ef9b6726244500f54e9bb1917ea95d5688661e4;hb=b4b7d1e49f7fea5ba42243ea2dbf3026cd313cec;hpb=40663f4a504fe6bb0a298488ed5393d692786c82

diff --git a/scanlib.pm b/scanlib.pm
index 8ef9b67..d8d0467 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -6,7 +6,6 @@
 # which was based on an unknown other script.
 #
 # Global variables:
-#   %comments       - map from bugnumber to bug description
 #   %premature      - list of prematurely closed bugreports
 #   %exclude        - list of bugreports to exclude from the report
 #   %maintainer     - map from packagename to maintainer
@@ -26,43 +25,7 @@ use warnings;
 require bugcfg;
 package scanlib;
 
-our (%comments,%premature,%exclude,%maintainer,%section,%packagelist,%NMU,%debbugssection,%bugs);
-
-sub readcomments() {
-# Read bug commentary 
-# It is in paragraph format, with the first line of each paragraph being
-# the bug number or package name to which the comment applies.
-# Prefix a bug number with a * to force it to be listed even if it's closed.
-# (This deals with prematurely closed bugs)
-
-	my $index;					# Bug-number for current comment
-	my $file;					# Name of comments-file
-
-	%comments = ();					# Initialize our data
-	%premature = ();
-	%exclude = ();
-	$file=shift;
-	open(C, $file) or die "open $file: $!\n";
-	while (<C>) {
-		chomp;
-		if (m/^\s*$/) {				# Check for paragraph-breaks
-			undef $index;
-		} elsif (defined $index) {
-			$comments{$index} .= $_ . "\n";
-		} else {
-			if (s/^\*//) {			# Test & remove initial *
-				$premature{$_} = 1;
-			}
-			if (s/\s+EXCLUDE\s*//) {	# Test & remove EXCLUDE
-				$exclude{$_} = 1;
-				next;
-			}
-			$index = $_;
-			$comments{$index} = '';	# New comment, initialize data
-		}
-	}
-	close(C);
-}
+our (%premature,%exclude,%maintainer,%section,%packagelist,%NMU,%debbugssection,%bugs);
 
 
 # Read the list of maintainer 
@@ -215,33 +178,48 @@ sub scanspooldir() {
 		$disttags{'testing'}      = grep(/^etch$/, @tags);
 		$disttags{'unstable'}     = grep(/^sid$/, @tags);
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
-
+			
 		# default according to dondelelcaro 2006-11-11
 		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 $relinfo = "";
-		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);
-
-			# 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));
+		if (defined($section{$bug->{'package'}}) && $section{$bug->{'package'}} eq 'pseudo') {
+			# versioning information makes no sense for pseudo packages,
+			# just use the tags
+			for my $dist qw(oldstable stable testing unstable experimental) {
+				$relinfo .= uc(substr($dist, 0, 1)) if $disttags{$dist};
 			}
+			next if (length($bug->{'done'}));
+		} else {
+			# only bother to check the versioning status for the distributions indicated by the tags 
+			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 => \@bugcfg::architectures
+				);
+
+				# 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 '';
 		}
-		
-		next if $relinfo eq '' and not $premature{$f};
-		$premature{$f}++ if $relinfo eq '';
 
 		$taginfo = "[";
 		$taginfo .= ($bug->{'keywords'} =~ /\bpending\b/        ? "P" : " ");
@@ -323,7 +301,6 @@ sub readNMUstatus() {
 			$NMU{$bug} = 1;
 			$NMU{$bug, "source"} = $source;
 			$NMU{$bug, "version"} = $version;
-#			$comments{$bug} .= "[FIXED] Fixed package $source is in Incoming\n";
 			$flag = 0;
 		} else {
 			($field, $value) = split(/: /, $_, 2);
@@ -337,7 +314,6 @@ sub readNMUstatus() {
 		$NMU{$bug} = 1;
 		$NMU{$bug, "source"} = $source;
 		$NMU{$bug, "version"} = $version;
-#		$comments{$bug} .= "[FIXED] Fixed package $source in in Incoming\n";
 	}
 	close P;
 }
@@ -361,12 +337,9 @@ sub htmlsanit {
 
 sub wwwnumber() {
 	my $number = shift;		# Number of bug to html-ize
-#	my $section);				# Section for the bug
 
 	"<A HREF=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&amp;bug=" .
 		urlsanit($number) . '">' . htmlsanit($number) . '</A>';
-#	($section=$number) =~ s/([0-9]{2}).*/$1/;
-#	"<A HREF=\"${btsURL}/db/$section/$number.html\">$number</A>";
 }
 
 sub wwwname() {
@@ -374,7 +347,6 @@ sub wwwname() {
 
 	"<A HREF=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=no&amp;pkg=" .
 		urlsanit($name) . '">' . htmlsanit($name) . '</A>';
-#	"<A HREF=\"${btsURL}/db/pa/l$name.html\">$name</A>";
 }
 
 sub check_worry {
@@ -382,7 +354,7 @@ sub check_worry {
 
 	if ($status =~ m/^\[[^]]*I/ or
 	    $status =~ m/ \[[^]]*X/ or
-            ($status =~ m/ \[[^]]*[OSUE]/ and $status !~ m/ \[[^]]*T/)) {
+            $status !~ m/ \[[^]]*T/) {
 		return 0;
 	}
 	return 1;