X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcounts;h=1920a5b617b2a5905335c1e3f199dc542ffe6bdc;hp=cf8809630e0fc77fa3bb4a31ae34bf297a90a58f;hb=d58d0b081c8bc059a905f7eb9c7dd6c38cd8e2ca;hpb=e23f39acb49098e01f20a8e6fdc9f68d296b45ed

diff --git a/bugcounts b/bugcounts
index cf88096..1920a5b 100755
--- a/bugcounts
+++ b/bugcounts
@@ -43,7 +43,6 @@ scanlib::readstatus($statusfile);
 scanlib::readcomments($commentsfile);
 
 my $total=0;		# total number of bugs
-my $removecount=0;	# Number of bugs that will disappear if packages are removed
 my $patchcount=0;	# Number of bugs that have a fix proposed
 my $pendingcount=0;	# Number of bugs that will have a fix uploaded RSN
 my $ignorecount=0;      # Number of bugs being ignored
@@ -53,7 +52,7 @@ my %sectcount=();	# Bugs per type
 
 for my $p (keys %scanlib::packagelist) {
 	next if (defined $bugcfg::exclude{$p});
-	for my $nr (sort split(/ /, $scanlib::packagelist{$p})) {
+	for my $nr (sort @{$scanlib::packagelist{$p}}) {
 		next if (defined $bugcfg::exclude{$nr});
 		$total++;
 		$pendingcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
@@ -64,18 +63,8 @@ for my $p (keys %scanlib::packagelist) {
 			my $sect = ($scanlib::comments{$nr} =~ m/\[([^]]*)\]/);
 			$sectcount{$sect}++;
 		}
-		unless ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/ or
-			$scanlib::bugs{$nr} =~ m/ \[[^]]*X/ or
-			($scanlib::bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $scanlib::bugs{$nr} !~ m/ \[[^]]*T/)) {
-			$worrycount++;
-			# print STDERR "$nr $bugs{$nr}\n";
-		}	
-	}
-
-	if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
-		my @a = split(/ /,$scanlib::packagelist{$p});
-		$removecount += scalar(@a);
+		$worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 	}
 }
 
-printf("%d %d %d %d %d %d %d\n", $total, $pendingcount, $patchcount, $removecount, $ignorecount, $nottestingcount, $worrycount);
+printf("%d %d %d 0 %d %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $nottestingcount, $worrycount);