X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=75654cc9b5b42eada2fa54cbdd8b5dc7137a2b71;hp=797e8d2345e49d2cb0719e32b6170e27b3c9eb0e;hb=817d5389c87ae35e3dabbcc689d1fd77a339daa2;hpb=4f2ac6d37c700e562e1ac5feb4e99bae28bb7618 diff --git a/bugreport b/bugreport index 797e8d2..75654cc 100755 --- a/bugreport +++ b/bugreport @@ -12,10 +12,6 @@ use warnings; my $Version = "BugReport 1.4\nCopyright (C) 1998-2002 Wichert Akkerman \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,14 +40,27 @@ sub PrintPackageHeader() { my ($name, $email); # Name & email of maintainer if ($html) { - print "
";
-		print "Package: " . &wwwname($p);
-		print " ($scanlib::section{$p}).\n";
+		print "
";
+		print "Package: " . scanlib::wwwname($p);
+		if (defined($scanlib::section{$p})) {
+			print " ($scanlib::section{$p}).\n";
+		} else {
+			print " (unknown).\n";
+		}
 		print "Maintainer: ";
-		if (defined($scanlib::maintainer{$p})) {
-			$_ = $scanlib::maintainer{$p};
-			($name,$email) = m/(.*) <([^>]*)>/;
-			print "$name <$email>\n";
+		if (exists($scanlib::maintainer{$p}) && $scanlib::maintainer{$p} ne '') {
+			if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
+				($name,$email) = ($1,$2);
+			} elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
+				($name,$email) = ($1,$2);
+			} elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
+				$name = $email = $1;
+			}
+			if (defined($name)) {
+				print "$name <$email>\n";
+			} else {
+				print "$scanlib::maintainer{$p}\n";
+			}
 		} else {
 			print "unknown\n";
 		}
@@ -75,25 +83,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 "";
-				}
-			}
-			$header=1;
-			&PrintPackageHeader($p);
-			print $scanlib::comments{$p};
-		}
-		for $nr (sort split(/ /, $scanlib::packagelist{$p})) {
-			next if (defined $bugcfg::exclude{$nr});
+		for $nr (sort @{$scanlib::packagelist{$p}}) {
 			if (! $header) {
 				$header = 1;
 				&PrintPackageHeader($p);
@@ -102,31 +95,30 @@ sub MakeBuglist() {
 			if ($html) {
 				my $worry = scanlib::check_worry($scanlib::bugs{$nr});
 			
-				if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
+				if ($scanlib::bugs{$nr}->{'pending'}) {
 					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
+				} elsif ($scanlib::bugs{$nr}->{'patch'}) {
 					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
+				} elsif ($scanlib::bugs{$nr}->{'help'}) {
 					print '';
 				}
-				print "" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+				print "" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
 				print "" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-				print "  " . &wwwnumber($nr) . ' ' .
-					  htmlsanit($scanlib::bugs{$nr}) . "\n";
+				printf "  %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 "" if $worry;
-				print "" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+				print "" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-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 $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 "" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-			                              $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
+			print "" if ($html && ($scanlib::bugs{$nr}->{'pending'} ||
+			                              $scanlib::bugs{$nr}->{'patch'} ||
+										  $scanlib::bugs{$nr}->{'help'}));
 		}
-		print "" if ($fontset);
 		if ($header) {
 			&PrintPackageFooter($p);
 		}
@@ -135,60 +127,48 @@ 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 $worrytotal=0;	# Total number of bugs we're actually worried about
+	my $stabletotal=0;	# Total number of bugs affecting stable
 	my %list;		# List of bugnumber associated with package
 
-	$bugcount=0;
 	for my $p (sort keys %scanlib::packagelist) {
-		next if (defined $scanlib::exclude{$p});
-		$count=0;
-		for my $nr (split(/ /, $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/));
-
-			if (not defined($scanlib::exclude{$nr})) {
-				$bugcount++;
-				$count++;
-			} 
+		my $count = 0;		# Number of bugs for this package
+
+		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'});
+			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
+			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
+
+			$bugcount++;
+			$count++;
 		}
-		$remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);
 	}
 
 	if ($html) {
 		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);
-		printf("Number on packages not in testing: %d
\n", $nottestingtotal);
-		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);
 	} 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);
-		printf("Number on packages not in testing: %d\n", $nottestingtotal);
-		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);
 	}
 }
 
 
-sub FilterPackages() {
+sub FilterPackages($) {
 	my $filter = shift;		# Distribution we want to keep
 
 	for my $p (sort keys %scanlib::packagelist) {
@@ -198,30 +178,27 @@ 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);
 	}
 }
 
-my ($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);
+FilterPackages($opt_d) if ($opt_d);
+FilterBugs() if ($opt_t);
 
 MakeStatistics if ($opt_s);
 if ($opt_l) {
-	MakeBuglist 
+	MakeBuglist();
 }
 
 exit 0;