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

diff --git a/bugreport b/bugreport
index bee423d..dbe1bcf 100755
--- a/bugreport
+++ b/bugreport
@@ -82,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->[0] <=> $b->[0]} keys %scanlib::packagelist) {
+	for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
 		next if (defined $bugcfg::exclude{$p});
 		$header = 0;
 		$fontset = 0;
@@ -158,10 +158,7 @@ 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++;
@@ -201,8 +198,8 @@ 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);
 	}
 }