X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=ff1b0c77c0cfc40ca966b43dc589b9b9e166f6fb;hp=79c325f27c223a0c61a3d4073a5ae65815922de3;hb=882c3a5e8e8d32eb965a7d1f805f8ea31668b91c;hpb=02cc5bba35cc8b9c6ce76a2c1bc7b520187bcaa3

diff --git a/bugreport b/bugreport
index 79c325f..ff1b0c7 100755
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
 				} elsif ($scanlib::bugs{$nr}->{'help'}) {
 					print '<span style="color: #ffaa30">';
 				}
-				print "<strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+				print "<strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
 				print "<em class=\"worry\">" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
 				printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
@@ -111,7 +111,7 @@ sub MakeBuglist() {
 					scanlib::get_relinfo($scanlib::bugs{$nr}), 
 					scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
 				print "</em>" if $worry;
-				print "</strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+				print "</strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
 			} else {
 				printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
 					scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
@@ -135,14 +135,18 @@ sub MakeStatistics() {
 	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
+        my %seen_bugs;          # bugs which have already been counted
 
 	for my $p (sort keys %scanlib::packagelist) {
 		my $count = 0;		# Number of bugs for this package
 
 		for my $nr (@{$scanlib::packagelist{$p}}) {
+                    # if we've already counted this bug, we don't want to count it again
+                    next if $seen_bugs{$nr};
+                    $seen_bugs{$nr} = 1;
 			$pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
 			$patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
-			$ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+			$ignoretotal++ if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
 			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
@@ -152,12 +156,12 @@ sub MakeStatistics() {
 	}
 
 	if ($html) {
-		print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
+		print "<strong><font color=\"red\">Total number of release-critical bugs</font>:</strong> $bugcount<BR>\n";
 		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:</strong> %d<P>\n", $worrytotal);
+		printf("<strong><font color=\"blue\">Number concerning the current stable release</font>:</strong> %d<BR>\n", $stabletotal);
+		printf("<strong><font color=\"green\">Number concerning the next release</font>:</strong> %d<P>\n", $worrytotal);
 	} else {
 		print "Total number of release-critical bugs: $bugcount\n";
 		printf("Number that have a patch: %d\n", $patchtotal);
@@ -173,7 +177,8 @@ sub FilterPackages($) {
 	my $filter = shift;		# Distribution we want to keep
 
 	for my $p (sort keys %scanlib::packagelist) {
-		delete $scanlib::packagelist{$p} unless ($scanlib::section{$p} =~ m/^$filter/);
+		delete $scanlib::packagelist{$p} unless (defined $scanlib::section{$p} and
+							 $scanlib::section{$p} =~ m/^$filter/);
 	}
 }