X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=001ce2f84adb4ed9ae3003c9f7d1952adc6e0797;hp=1686ae88e0ab0ab86dc76b5277d32276d381d64c;hb=6105d8c40612530ff2a544473d7be9e950afbe95;hpb=eeb9193b817dc0b95ce845911c8d9cab4759c8ef

diff --git a/bugreport b/bugreport
index 1686ae8..001ce2f 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";
 		}
@@ -123,8 +131,8 @@ sub MakeStatistics() {
 	my $patchtotal=0;	# Total number of bugs marked patch
 	my $pendingtotal=0;	# Total number of bugs marked pending
 	my $ignoretotal=0;	# Total number of bugs marked ignore
-	my $nottestingtotal=0;	# Total number of bugs on packages not in testing
 	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) {
@@ -135,8 +143,8 @@ sub MakeStatistics() {
 			$pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
 			$patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
 			$ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
-			$nottestingtotal++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
 			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
+			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
 			if (not defined($scanlib::exclude{$nr})) {
 				$bugcount++;
@@ -150,14 +158,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 on packages not in testing:</strong> %d<BR>\n", $nottestingtotal);
+		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 on packages not in testing: %d\n", $nottestingtotal);
+		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);
 	}
 }