X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=5749ac2ccb2d38afffca83741cab39e4ecae7b31;hp=e06d3c989e8d3c46d37379850430cd3f0c4446c2;hb=a00cbd2ed63bad10e639c9b2d58d9a933b976e6e;hpb=d5a0b74a3ddd8ad47fb594e890dfd0f454627655 diff --git a/bugreport b/bugreport index e06d3c9..5749ac2 100755 --- a/bugreport +++ b/bugreport @@ -23,13 +23,14 @@ sub ShowVersion() { sub ShowUsage() { print <Package: " . &wwwname($p); + print "
";
+		print "Package: " . &wwwname($p);
 		print " ($section{$p}).\n";
 		print "Maintainer: ";
 		if (defined($maintainer{$p})) {
@@ -58,6 +60,13 @@ sub PrintPackageHeader() {
 	}
 }
 
+sub PrintPackageFooter() {
+	local($p)	= shift;	# Package to print
+
+	if ($html) {
+		print "
\n"; + } +} sub MakeBuglist() { local ($p); # Index variable @@ -66,7 +75,6 @@ sub MakeBuglist() { local ($header); # Flag if packagename has already been printed local ($fontset); # Did we change the font? - print "
\n" if ($html);
 	for $p (sort {$a cmp $b} keys %packagelist) {
 		next if (defined $exclude{$p});
 		$header = 0;
@@ -75,7 +83,7 @@ sub MakeBuglist() {
 			if ($html && defined($comments{$p})) {
 				if ($comments{$p} =~ m/^\[REMOVE\]/) {
 					$fontset=1;
-					print "";
+					print "";
 				}
 			}
 			$header=1;
@@ -90,31 +98,42 @@ sub MakeBuglist() {
 			}
 
 			if ($html) {
+			    $worry = 1;
+				if ($bugs{$nr} =~ m/^\[[^]]*I/ or
+					$bugs{$nr} =~ m/ \[[^]]*X/ or
+					($bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $bugs{$nr} !~ m/ \[[^]]*T/)) {
+					$worry = 0;
+				}
+			
 				if ($bugs{$nr} =~ m/ \[[^]]*X/) {
-					print '';
+					print '';
 				} elsif ($bugs{$nr} =~ m/^\[[^]]*P/) {
-					print '';
+					print '';
 				} elsif ($bugs{$nr} =~ m/^\[[^]]*\+/) {
-					print '';
+					print '';
 				} elsif ($bugs{$nr} =~ m/^\[[^]]*H/) {
-					print '';
+					print '';
 				}
 				print "" if ($bugs{$nr} =~ m/^\[.......I\]/);
+				print "" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-				print "  " . &wwwnumber($nr) . ' ' .
+				print "  " . &wwwnumber($nr) . ' ' .
 					  htmlsanit($bugs{$nr}) . "\n";
+				print "" if $worry;
 				print "" if ($bugs{$nr} =~ m/^\[.......I\]/);
 			} else {
 				printf("  %-6d %s\n", $nr, $bugs{$nr});
 			}
 			print $comments{$nr} if (defined($comments{$nr}));
 			print "[FIX] Fixed by package " . $NMU{$nr, "source"} . ", version " . $NMU{$nr, "version"} . " in Incoming\n" if (defined $NMU{$nr});
-			print "" if ($html && ($bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
+			print "" if ($html && ($bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
 			                              $bugs{$nr} =~ m/ \[[^]]*X/));
 		}
-		print "" if ($fontset);
+		print "" if ($fontset);
+		if ($header) {
+			&PrintPackageFooter($p);
+		}
 	}
-	print "
\n" if ($html); } @@ -180,7 +199,14 @@ sub FilterPackages() { } } -getopts('VhHlsd:S:C:'); +sub FilterBugs() { + for $p (sort keys %packagelist) { + $packagelist{$p} = join(' ', grep { check_worry($bugs{$_}) } split / /, $packagelist{$p}); + delete $packagelist{$p} if ($packagelist{$p} eq ''); + } +} + +getopts('VhHlstd:S:C:'); ShowUsage if ($opt_h); ShowVersion if ($opt_V); $statusfile=$opt_S if ($opt_S); @@ -192,6 +218,7 @@ $html=1 if ($opt_H); &readNMUstatus($NMUfile); &FilterPackages($opt_d) if ($opt_d); +&FilterBugs() if ($opt_t); MakeStatistics if ($opt_s); if ($opt_l) {