X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=dbe1bcf602e03c63d9c475092753177bb3f10515;hp=797e8d2345e49d2cb0719e32b6170e27b3c9eb0e;hb=e9eb807741db0e4c06a4ca4dd9e5eea0ea843d9c;hpb=4f2ac6d37c700e562e1ac5feb4e99bae28bb7618

diff --git a/bugreport b/bugreport
index 797e8d2..dbe1bcf 100755
--- a/bugreport
+++ b/bugreport
@@ -45,13 +45,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";
@@ -92,7 +97,7 @@ sub MakeBuglist() {
 			&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,8 +119,8 @@ 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 {
@@ -135,30 +140,25 @@ 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 $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
+	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++;
@@ -188,7 +188,7 @@ sub MakeStatistics() {
 }
 
 
-sub FilterPackages() {
+sub FilterPackages($) {
 	my $filter = shift;		# Distribution we want to keep
 
 	for my $p (sort keys %scanlib::packagelist) {
@@ -198,12 +198,12 @@ 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_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
 
 getopts('VhHlstd:S:C:');
 ShowUsage if ($opt_h);
@@ -216,12 +216,12 @@ 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;