X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=2d2cbadb0eafbd9c332897792a34b4ae57d8ce7c;hp=f1501c32cbe35135a0c9be6b79a6591bb80eb4d7;hb=8ddb60b02f6e4b12b2f5db92f36f7c19471524a4;hpb=37c1a7189dec60183ce19b121afa2747f17dda68

diff --git a/bugreport b/bugreport
index f1501c3..2d2cbad 100755
--- a/bugreport
+++ b/bugreport
@@ -42,9 +42,13 @@ sub PrintPackageHeader() {
 	if ($html) {
 		print "<div class=\"package\"><pre>";
 		print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);
-		print " ($scanlib::section{$p}).\n";
+		if (defined($scanlib::section{$p})) {
+			print " ($scanlib::section{$p}).\n";
+		} else {
+			print " (unknown).\n";
+		}
 		print "<strong>Maintainer:</strong> ";
-		if (defined($scanlib::maintainer{$p})) {
+		if (exists($scanlib::maintainer{$p}) && $scanlib::maintainer{$p} ne '') {
 			if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
 				($name,$email) = ($1,$2);
 			} elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
@@ -52,7 +56,11 @@ sub PrintPackageHeader() {
 			} elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
 				$name = $email = $1;
 			}
-			print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
+			if (defined($name)) {
+				print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
+			} else {
+				print "$scanlib::maintainer{$p}\n";
+			}
 		} else {
 			print "unknown\n";
 		}
@@ -77,10 +85,8 @@ sub MakeBuglist() {
 	my $header;		# Flag if packagename has already been printed
 
 	for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
-		next if (defined $bugcfg::exclude{$p});
 		$header = 0;
 		for $nr (sort @{$scanlib::packagelist{$p}}) {
-			next if (defined $bugcfg::exclude{$nr});
 			if (! $header) {
 				$header = 1;
 				&PrintPackageHeader($p);
@@ -124,22 +130,21 @@ sub MakeStatistics() {
 	my $pendingtotal=0;	# Total number of bugs marked pending
 	my $ignoretotal=0;	# Total number of bugs marked ignore
 	my $worrytotal=0;	# Total number of bugs we're actually worried about
+	my $stabletotal=0;	# Total number of bugs affecting stable
 	my %list;		# List of bugnumber associated with package
 
 	for my $p (sort keys %scanlib::packagelist) {
 		my $count = 0;		# Number of bugs for this package
 
-		next if (defined $scanlib::exclude{$p});
 		for my $nr (@{$scanlib::packagelist{$p}}) {
-			$pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
-			$patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
-			$ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
+			$pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
+			$patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
+			$ignoretotal++ if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
 			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
+			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
-			if (not defined($scanlib::exclude{$nr})) {
-				$bugcount++;
-				$count++;
-			} 
+			$bugcount++;
+			$count++;
 		}
 	}
 
@@ -148,12 +153,14 @@ sub MakeStatistics() {
 		printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
 		printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
 		printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);
+		printf("<strong>Number concerning the current stable release:</strong> %d<BR>\n", $stabletotal);
 		printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
 	} else {
 		print "Total number of release-critical bugs: $bugcount\n";
 		printf("Number that have a patch: %d\n", $patchtotal);
 		printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal);
 		printf("Number that are being ignored: %d\n", $ignoretotal);
+		printf("Number concerning the current stable release: %d<P>\n", $stabletotal);
 		printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
 	}
 }