X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=63f887412bc5c2e44e0c564ceca1e55e949f77ba;hp=c528495147989e7446d781ba83ad8451e12d2377;hb=79a7d8380b9712a363a95e8998d6ba3e95ff581b;hpb=debbe8bbf0dfbd8264ae94b07fab46b02a16f54e

diff --git a/bugreport b/bugreport
index c528495..63f8874 100755
--- a/bugreport
+++ b/bugreport
@@ -12,7 +12,6 @@ use warnings;
 my $Version		= "BugReport 1.4\nCopyright (C) 1998-2002 Wichert Akkerman <wakkerma\@debian.org>\n";
 my $html		= 0;
 my $statusfile		= "status";
-my $commentsfile	= "comments";
 my $NMUfile		= "/debian/home/doogie/public_html/incoming/bugs_closed";
 $NMUfile		= "/debian/home/doogie/chgscan/db/bugs_closed"; # Changed as of request by dark  -Joey, 99/11/22
 $NMUfile		= "http://auric.debian.org/~doogie/incoming/bugs_closed"; # Changed as of request by dark  -Joey, 99/11/22
@@ -35,7 +34,6 @@ Options:
   -t    show bugs relevant for testing only
   -d    only list these distributions (comma-separated)
   -S    use different statusfile
-  -C    use different commentsfile
 EOF
 	exit 0;
 }
@@ -80,23 +78,10 @@ sub MakeBuglist() {
 	my $nr;			# Current bugnumber
 	my $sect;			# BTS-subsection for bugnumber
 	my $header;		# Flag if packagename has already been printed
-	my $fontset;		# Did we change the font?
 
 	for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
 		next if (defined $bugcfg::exclude{$p});
 		$header = 0;
-		$fontset = 0;
-		if (defined $scanlib::comments{$p}) {
-			if ($html && defined($scanlib::comments{$p})) {
-				if ($scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
-					$fontset=1;
-					print "<span style=\"color: red\">";
-				}
-			}
-			$header=1;
-			&PrintPackageHeader($p);
-			print $scanlib::comments{$p};
-		}
 		for $nr (sort @{$scanlib::packagelist{$p}}) {
 			next if (defined $bugcfg::exclude{$nr});
 			if (! $header) {
@@ -126,12 +111,10 @@ sub MakeBuglist() {
 			} else {
 				printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
 			}
-			print $scanlib::comments{$nr} if (defined($scanlib::comments{$nr}));
 			print "[FIX] Fixed by package " . $scanlib::NMU{$nr, "source"} . ", version " . $scanlib::NMU{$nr, "version"} . " in Incoming\n" if (defined $scanlib::NMU{$nr});
 			print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
 			                              $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
 		}
-		print "</span>" if ($fontset);
 		if ($header) {
 			&PrintPackageFooter($p);
 		}
@@ -141,7 +124,6 @@ sub MakeBuglist() {
 
 sub MakeStatistics() {
 	my $bugcount=0;		# Total number of bugs so far
-	my $remtotal=0;		# Total number of bugs for packages marked REMOVE
 	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
@@ -158,22 +140,17 @@ sub MakeStatistics() {
 			$patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
 			$ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
 			$nottestingtotal++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
-			$worrytotal++ unless (
-				$scanlib::bugs{$nr} =~ m/^\[[^]]*I/ or
-				$scanlib::bugs{$nr} =~ m/ \[[^]]*X/ or
-				($scanlib::bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $scanlib::bugs{$nr} !~ m/ \[[^]]*T/));
+			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 
 			if (not defined($scanlib::exclude{$nr})) {
 				$bugcount++;
 				$count++;
 			} 
 		}
-		$remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);
 	}
 
 	if ($html) {
 		print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
-		printf("<strong>Number that will disappear after removing packages marked [REMOVE]:</strong> %d<BR>\n", $remtotal);
 		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);
@@ -181,7 +158,6 @@ sub MakeStatistics() {
 		printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
 	} else {
 		print "Total number of release-critical bugs: $bugcount\n";
-		printf("Number that will disappear after removing packages marked [REMOVE]: %d\n", $remtotal);
 		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);
@@ -201,22 +177,20 @@ sub FilterPackages($) {
 
 sub FilterBugs() {
 	for my $p (sort keys %scanlib::packagelist) {
-		$scanlib::packagelist{$p} = join(' ', grep { scanlib::check_worry($scanlib::bugs{$_}) } split / /, $scanlib::packagelist{$p});
-		delete $scanlib::packagelist{$p} if ($scanlib::packagelist{$p} eq '');
+		$scanlib::packagelist{$p} = [ grep { scanlib::check_worry($scanlib::bugs{$_}) } @{$scanlib::packagelist{$p}} ];
+		delete $scanlib::packagelist{$p} if (scalar @{$scanlib::packagelist{$p}} == 0);
 	}
 }
 
-our ($opt_h,$opt_V,$opt_S,$opt_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
+our ($opt_h,$opt_V,$opt_S,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
 
-getopts('VhHlstd:S:C:');
+getopts('VhHlstd:S:');
 ShowUsage if ($opt_h);
 ShowVersion if ($opt_V);
 $statusfile=$opt_S if ($opt_S);
-$commentsfile=$opt_C if ($opt_C);
 $html=1 if ($opt_H);
 
 scanlib::readstatus($statusfile);
-scanlib::readcomments($commentsfile);
 # scanlib::readNMUstatus($NMUfile);
 
 FilterPackages($opt_d) if ($opt_d);