X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=b68a6c65bbba7e644beb68512d177e74b0a9fba9;hp=3b128fda610d5c6ed8cc8f6ceb9a4ebdec2d75d8;hb=HEAD;hpb=3924a03164fa1d9a292bf9627cce5d37ee9335f2

diff --git a/bugreport b/bugreport
index 3b128fd..b68a6c6 100755
--- a/bugreport
+++ b/bugreport
@@ -4,8 +4,10 @@
 # Generate a report of the release-critical bugs for packages
 
 use Getopt::Std;
-require scanlib;
-require bugcfg;
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+use scanlib;
 use strict;
 use warnings;
 
@@ -103,7 +105,7 @@ sub MakeBuglist() {
 				} elsif ($scanlib::bugs{$nr}->{'help'}) {
 					print '<span style="color: #ffaa30">';
 				}
-				print "<strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-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 +113,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}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-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'});
@@ -127,24 +129,30 @@ sub MakeBuglist() {
 }
 
 
-sub MakeStatistics() {
+sub MakeStatistics {
 	my $bugcount=0;		# Total number of bugs so far
 	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 $worrytotal=0;	# Total number of bugs we're actually worried about
 	my $stabletotal=0;	# Total number of bugs affecting stable
+    my $oldstabletotal=0; # Total number of bugs affecting oldstable
 	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}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-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}));
+			$oldstabletotal++ if (scanlib::check_worry_oldstable($scanlib::bugs{$nr}));
 
 			$bugcount++;
 			$count++;
@@ -152,12 +160,13 @@ sub MakeStatistics() {
 	}
 
 	if ($html) {
-		print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
+		print "<strong><font color=\"#9400D3\">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=\"#56b4e9\">Number concerning the current stable release</font>:</strong> %d<BR>\n", $stabletotal);
+		printf("<strong><font color=\"#009e73\">Number concerning the next release</font>:</strong> %d<P>\n", $worrytotal);
+		printf("<strong><font color=\"#e69f00\">Number concerning the previous stable release</font>:</strong> %d<P>\n", $oldstabletotal);
 	} else {
 		print "Total number of release-critical bugs: $bugcount\n";
 		printf("Number that have a patch: %d\n", $patchtotal);
@@ -165,6 +174,7 @@ sub MakeStatistics() {
 		printf("Number that are being ignored: %d\n", $ignoretotal);
 		printf("Number concerning the current stable release: %d\n", $stabletotal);
 		printf("Number concerning the next release: %d\n", $worrytotal);
+		printf("Number concerning the previous stable release: %d\n", $oldstabletotal);
 	}
 }
 
@@ -173,7 +183,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/);
 	}
 }
 
@@ -190,10 +201,16 @@ sub FilterBugsStable() {
 		delete $scanlib::packagelist{$p} if (scalar @{$scanlib::packagelist{$p}} == 0);
 	}
 }
+sub FilterBugsOldStable() {
+	for my $p (sort keys %scanlib::packagelist) {
+		$scanlib::packagelist{$p} = [ grep { scanlib::check_worry_oldstable($scanlib::bugs{$_}) } @{$scanlib::packagelist{$p}} ];
+		delete $scanlib::packagelist{$p} if (scalar @{$scanlib::packagelist{$p}} == 0);
+	}
+}
 
-our ($opt_h,$opt_V,$opt_S,$opt_H,$opt_d,$opt_b,$opt_t,$opt_s,$opt_l);
+our ($opt_h,$opt_V,$opt_S,$opt_H,$opt_d,$opt_b,$opt_t,$opt_s,$opt_l,$opt_o);
 
-getopts('VhHlsbtd:S:');
+getopts('VhHlsbtod:S:');
 ShowUsage if ($opt_h);
 ShowVersion if ($opt_V);
 $statusfile=$opt_S if ($opt_S);
@@ -204,8 +221,9 @@ scanlib::readstatus($statusfile);
 FilterPackages($opt_d) if ($opt_d);
 FilterBugsStable() if ($opt_b);
 FilterBugs() if ($opt_t);
+FilterBugsOldStable() if ($opt_o);
 
-MakeStatistics if ($opt_s);
+MakeStatistics() if ($opt_s);
 if ($opt_l) {
 	MakeBuglist();
 }