X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=1686ae88e0ab0ab86dc76b5277d32276d381d64c;hp=f6be50a60c198761dde79b126e90981cf1b43048;hb=4ef8564c7e87c67015de727dbf9bd23a51f927d3;hpb=e23f39acb49098e01f20a8e6fdc9f68d296b45ed

diff --git a/bugreport b/bugreport
index f6be50a..1686ae8 100755
--- a/bugreport
+++ b/bugreport
@@ -12,10 +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
 
 sub ShowVersion() {
 	print "$Version\n";
@@ -35,7 +31,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;
 }
@@ -45,13 +40,18 @@ sub PrintPackageHeader() {
 	my ($name, $email);	# Name & email of maintainer
 
 	if ($html) {
-	    print "<div class=\"package\"><pre>";
-		print "<a name=\"$p\"><strong>Package:</strong></a> " . &wwwname($p);
+		print "<div class=\"package\"><pre>";
+		print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);
 		print " ($scanlib::section{$p}).\n";
 		print "<strong>Maintainer:</strong> ";
 		if (defined($scanlib::maintainer{$p})) {
-			$_ = $scanlib::maintainer{$p};
-			($name,$email) = m/(.*) <([^>]*)>/;
+			if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
+				($name,$email) = ($1,$2);
+			} elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
+				($name,$email) = ($1,$2);
+			} elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
+				$name = $email = $1;
+			}
 			print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
 		} else {
 			print "unknown\n";
@@ -75,24 +75,11 @@ 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 split(/ /, $scanlib::packagelist{$p})) {
+		for $nr (sort @{$scanlib::packagelist{$p}}) {
 			next if (defined $bugcfg::exclude{$nr});
 			if (! $header) {
 				$header = 1;
@@ -114,19 +101,16 @@ sub MakeBuglist() {
 				print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
 				print "<em class=\"worry\">" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-				print "<A NAME=\"$nr\"></A>  " . &wwwnumber($nr) . ' ' .
-					  htmlsanit($scanlib::bugs{$nr}) . "\n";
+				print "<A NAME=\"$nr\"></A>  " . scanlib::wwwnumber($nr) . ' ' .
+					  scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n";
 				print "</em>" if $worry;
 				print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
 			} 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);
 		}
@@ -135,42 +119,34 @@ sub MakeBuglist() {
 
 
 sub MakeStatistics() {
-	my $bugcount;		# Total number of bugs so far
-	my $count;		# Number of bugs for this package
-	my $remtotal;		# Total number of bugs for packages marked REMOVE
-	my $patchtotal;		# Total number of bugs marked patch
-	my $pendingtotal;	# Total number of bugs marked pending
-	my $ignoretotal;	# Total number of bugs marked ignore
-	my $nottestingtotal;	# Total number of bugs on packages not in testing
-	my $worrytotal;		# Total number of bugs we're actually worried about
-	my $p;			# Index variable
+	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 $nottestingtotal=0;	# Total number of bugs on packages not in testing
+	my $worrytotal=0;	# Total number of bugs we're actually worried about
 	my %list;		# List of bugnumber associated with package
 
-	$bugcount=0;
 	for my $p (sort keys %scanlib::packagelist) {
+		my $count = 0;		# Number of bugs for this package
+
 		next if (defined $scanlib::exclude{$p});
-		$count=0;
-		for my $nr (split(/ /, $scanlib::packagelist{$p})) {
+		for my $nr (@{$scanlib::packagelist{$p}}) {
 			$pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
 			$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);
@@ -178,7 +154,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);
@@ -198,23 +173,20 @@ sub FilterPackages($) {
 
 sub FilterBugs() {
 	for my $p (sort keys %scanlib::packagelist) {
-		$scanlib::packagelist{$p} = join(' ', grep { 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);
 FilterBugs() if ($opt_t);