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

diff --git a/bugreport b/bugreport
index 75654cc..facc662 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
@@ -102,7 +103,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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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),
@@ -110,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}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+				print "</strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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'});
@@ -141,7 +142,7 @@ sub MakeStatistics() {
 		for my $nr (@{$scanlib::packagelist{$p}}) {
 			$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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
 			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
@@ -183,9 +184,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);
@@ -194,6 +202,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);