X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=f9654bbd03aefb2e94070aa96737de20ac731c18;hp=d05e445577228a597a5aa90a4a4d3315aba35d38;hb=038c6aa61e809657e74971f8fe72a56fe57551a7;hpb=70a909d8e2353e3e1b5b202120bdc4df398bd228 diff --git a/bugreport b/bugreport index d05e445..f9654bb 100755 --- a/bugreport +++ b/bugreport @@ -45,13 +45,18 @@ sub PrintPackageHeader() { my ($name, $email); # Name & email of maintainer if ($html) { - print "
";
-		print "Package: " . &wwwname($p);
+		print "
";
+		print "Package: " . scanlib::wwwname($p);
 		print " ($scanlib::section{$p}).\n";
 		print "Maintainer: ";
 		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 <$email>\n";
 		} else {
 			print "unknown\n";
@@ -77,7 +82,7 @@ sub MakeBuglist() {
 	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) {
+	for my $p (sort {$a->[0] <=> $b->[0]} keys %scanlib::packagelist) {
 		next if (defined $bugcfg::exclude{$p});
 		$header = 0;
 		$fontset = 0;
@@ -92,137 +97,3 @@ sub MakeBuglist() {
 			&PrintPackageHeader($p);
 			print $scanlib::comments{$p};
 		}
-		for $nr (sort split(/ /, $scanlib::packagelist{$p})) {
-			next if (defined $bugcfg::exclude{$nr});
-			if (! $header) {
-				$header = 1;
-				&PrintPackageHeader($p);
-			}
-
-			if ($html) {
-				my $worry = scanlib::check_worry($scanlib::bugs{$nr});
-			
-				if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
-					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
-					print '';
-				} elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
-					print '';
-				}
-				print "" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
-				print "" if $worry;
-				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-				print "  " . &wwwnumber($nr) . ' ' .
-					  htmlsanit($scanlib::bugs{$nr}) . "\n";
-				print "" if $worry;
-				print "" 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 "" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-			                              $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
-		}
-		print "" if ($fontset);
-		if ($header) {
-			&PrintPackageFooter($p);
-		}
-	}
-}
-
-
-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 %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++;
-			} 
-		}
-		$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);
-	} 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);
-	}
-}
-
-
-sub FilterPackages() {
-	my $filter = shift;		# Distribution we want to keep
-
-	for my $p (sort keys %scanlib::packagelist) {
-		delete $scanlib::packagelist{$p} unless ($scanlib::section{$p} =~ m/^$filter/);
-	}
-}
-
-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 '');
-	}
-}
-
-my ($opt_h,$opt_V,$opt_S,$opt_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
-
-getopts('VhHlstd:S:C:');
-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);
-
-MakeStatistics if ($opt_s);
-if ($opt_l) {
-	MakeBuglist 
-}
-
-exit 0;
-