X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=bugreport;h=2d2cbadb0eafbd9c332897792a34b4ae57d8ce7c;hb=9199c4eac048f4443133023f938885f95ea7251b;hp=8bb3b5835a0b0f0f01fbf3a34436d95e115d7d2d;hpb=c0db4b9d56c1fbb988dffa9fff9f86d181d8b270;p=bugscan.git

diff --git a/bugreport b/bugreport
index 8bb3b58..2d2cbad 100755
--- a/bugreport
+++ b/bugreport
@@ -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);
@@ -138,18 +136,15 @@ sub MakeStatistics() {
 	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++;
 		}
 	}
 
@@ -158,15 +153,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<BR>\n", $worrytotal);
-		printf("<strong>Number concerning the current stable release:</strong> %d<P>\n", $stabletotal);
+		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 next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
 		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);
 	}
 }