X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=75654cc9b5b42eada2fa54cbdd8b5dc7137a2b71;hp=e176dfaa7e63062005139e539a2581bb8f274f1f;hb=817d5389c87ae35e3dabbcc689d1fd77a339daa2;hpb=74ca4b7ddabea1799631b4b8c36223d0cdcd15d6

diff --git a/bugreport b/bugreport
index e176dfa..75654cc 100755
--- a/bugreport
+++ b/bugreport
@@ -43,9 +43,9 @@ sub PrintPackageHeader() {
 		print "<div class=\"package\"><pre>";
 		print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);
 		if (defined($scanlib::section{$p})) {
-			print " (unknown).\n";
-		} else {
 			print " ($scanlib::section{$p}).\n";
+		} else {
+			print " (unknown).\n";
 		}
 		print "<strong>Maintainer:</strong> ";
 		if (exists($scanlib::maintainer{$p}) && $scanlib::maintainer{$p} ne '') {
@@ -85,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);
@@ -97,27 +95,29 @@ sub MakeBuglist() {
 			if ($html) {
 				my $worry = scanlib::check_worry($scanlib::bugs{$nr});
 			
-				if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-					print '<span style="color: #808080">';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
+				if ($scanlib::bugs{$nr}->{'pending'}) {
 					print '<span style="color: #f040d0">';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
+				} elsif ($scanlib::bugs{$nr}->{'patch'}) {
 					print '<span style="color: #00aa00">';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
+				} elsif ($scanlib::bugs{$nr}->{'help'}) {
 					print '<span style="color: #ffaa30">';
 				}
-				print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+				print "<strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
 				print "<em class=\"worry\">" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-				print "<A NAME=\"$nr\"></A>  " . scanlib::wwwnumber($nr) . ' ' .
-					  scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n";
+				printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
+					scanlib::get_taginfo($scanlib::bugs{$nr}),
+					scanlib::get_relinfo($scanlib::bugs{$nr}), 
+					scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
 				print "</em>" if $worry;
-				print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+				print "</strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
 			} else {
-				printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
+				printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
+					scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
 			}
-			print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-			                              $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
+			print "</span>" if ($html && ($scanlib::bugs{$nr}->{'pending'} ||
+			                              $scanlib::bugs{$nr}->{'patch'} ||
+										  $scanlib::bugs{$nr}->{'help'}));
 		}
 		if ($header) {
 			&PrintPackageFooter($p);
@@ -132,22 +132,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++;
 		}
 	}
 
@@ -156,13 +155,15 @@ 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 next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
+		printf("<strong>Number concerning the current stable release:</strong> %d<BR>\n", $stabletotal);
+		printf("<strong>Number concerning the next release:</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 next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
+		printf("Number concerning the current stable release: %d\n", $stabletotal);
+		printf("Number concerning the next release: %d\n", $worrytotal);
 	}
 }