X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=c8cc82d0388e769893a2549068a183c885ee1c13;hp=eee96b3019c17c56cca8fcba2a51be2b5c1bd9cc;hb=c6c21e31883775d12d06f104c91c6b1a00b48df0;hpb=c254a0d0c6ce35fab30d43d9e4e7e3015e250013

diff --git a/bugreport b/bugreport
index eee96b3..c8cc82d 100755
--- a/bugreport
+++ b/bugreport
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# vim: ts=4 sw=4 nowrap
+# vim: ts=8 sw=8 nowrap
 
 # Generate a report of the release-critical bugs for packages
 
@@ -21,13 +21,14 @@ sub ShowVersion() {
 sub ShowUsage() {
 	print <<EOF;
 Usage:
-  $0 [-V] [-h] [-H] [-l] [-s] [-d distrib] [-S file] [-C file]
+  $0 [-V] [-h] [-H] [-l] [-s] [-b] [-t] [-d distrib] [-S file] [-C file]
 Options:
   -V    show version
   -h    show some (hopefully) helpful information
   -H    produce HTML output
   -l    list all release-critical bugs
   -s    list bug statistics
+  -b    show bugs relevant for stable only
   -t    show bugs relevant for testing only
   -d    only list these distributions (comma-separated)
   -S    use different statusfile
@@ -85,10 +86,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 +96,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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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);
@@ -138,18 +139,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}->{'pending'});
 			$patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
-			$ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'});
+			$ignoretotal++ if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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++;
 		}
 	}
 
@@ -159,14 +157,14 @@ sub MakeStatistics() {
 		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 (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
+		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 current stable release: %d<P>\n", $stabletotal);
-		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);
 	}
 }
 
@@ -175,7 +173,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/);
 	}
 }
 
@@ -186,9 +185,16 @@ sub FilterBugs() {
 	}
 }
 
-our ($opt_h,$opt_V,$opt_S,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
+sub FilterBugsStable() {
+	for my $p (sort keys %scanlib::packagelist) {
+		$scanlib::packagelist{$p} = [ grep { scanlib::check_worry_stable($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);
 
-getopts('VhHlstd:S:');
+getopts('VhHlsbtd:S:');
 ShowUsage if ($opt_h);
 ShowVersion if ($opt_V);
 $statusfile=$opt_S if ($opt_S);
@@ -197,6 +203,7 @@ $html=1 if ($opt_H);
 scanlib::readstatus($statusfile);
 
 FilterPackages($opt_d) if ($opt_d);
+FilterBugsStable() if ($opt_b);
 FilterBugs() if ($opt_t);
 
 MakeStatistics if ($opt_s);