X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcounts;h=1a84994c803d2a8899a17db99e833af474131e70;hp=1920a5b617b2a5905335c1e3f199dc542ffe6bdc;hb=02cc5bba35cc8b9c6ce76a2c1bc7b520187bcaa3;hpb=e5d969744101034c2ccc00fa5cc24718bc202f2b

diff --git a/bugcounts b/bugcounts
index 1920a5b..1a84994 100755
--- a/bugcounts
+++ b/bugcounts
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# vim: ts=4 sw=4 nowrap
+# vim: ts=8 sw=8 nowrap
 
 # Generate some counts for the bugreports
 
@@ -7,11 +7,10 @@ use Getopt::Std;
 require scanlib;
 require bugcfg;
 use strict;
-use warnings;
+# use warnings;
 
 my $Version		= "BugCount 1.1\nCopyright (C) Wichert Akkerman <wakkerma\@debian.org>\n";
 my $statusfile		= "status";
-my $commentsfile	= "comments";
 
 sub ShowVersion() {
 	print "$Version\n";
@@ -26,45 +25,33 @@ Options:
   -V    show version
   -h    show some (hopefully) helpfull information
   -S    use different statusfile
-  -C    use different commentsfile
 EOF
 	exit 0;
 }
 
-our ($opt_h,$opt_V,$opt_S,$opt_C);
+our ($opt_h,$opt_V,$opt_S);
 
-getopts('VhS:C:');
+getopts('VhS:');
 ShowUsage if ($opt_h);
 ShowVersion if ($opt_V);
 $statusfile=$opt_S if ($opt_S);
-$commentsfile=$opt_C if ($opt_C);
 
 scanlib::readstatus($statusfile);
-scanlib::readcomments($commentsfile);
 
 my $total=0;		# total number of bugs
 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
-my $nottestingcount=0;	# Number of bugs on packages not in testing
+my $ignorecount=0;  # Number of bugs being ignored
 my $worrycount=0;	# Number of bugs we're actually worried about
-my %sectcount=();	# Bugs per type
-
-for my $p (keys %scanlib::packagelist) {
-	next if (defined $bugcfg::exclude{$p});
-	for my $nr (sort @{$scanlib::packagelist{$p}}) {
-		next if (defined $bugcfg::exclude{$nr});
-		$total++;
-		$pendingcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
-		$patchcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
-		$ignorecount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
-		$nottestingcount++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
-		if (defined $scanlib::comments{$nr}) {
-			my $sect = ($scanlib::comments{$nr} =~ m/\[([^]]*)\]/);
-			$sectcount{$sect}++;
-		}
-		$worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
-	}
+my $stablecount=0;	# Number of bugs affecting stable
+
+for my $bug (values %scanlib::bugs) {
+	$total++;
+	$pendingcount++ if ($bug->{'pending'});
+	$patchcount++ if ($bug->{'patch'});
+	$ignorecount++ if ($bug->{'etch-ignore'} || $bug->{'lenny-ignore'});
+	$worrycount++ if (scanlib::check_worry($bug));
+	$stablecount++ if (scanlib::check_worry_stable($bug));
 }
 
-printf("%d %d %d 0 %d %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $nottestingcount, $worrycount);
+printf("%d %d %d 0 %d 0 %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $worrycount, $stablecount);