remove definnition for makestatistics; add missing ()

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index c8cc82d0388e769893a2549068a183c885ee1c13..34ddb6e4643a9b463046ef35e5852d3f956644ba 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -4,8 +4,10 @@
 # Generate a report of the release-critical bugs for packages
 
 use Getopt::Std;
-require scanlib;
-require bugcfg;
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+use scanlib;
 use strict;
 use warnings;
 
@@ -103,7 +105,7 @@ sub MakeBuglist() {
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }
-                               print "<strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
+                               print "<strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
                                printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
@@ -111,7 +113,7 @@ sub MakeBuglist() {
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), 
                                        scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
                                print "</em>" if $worry;
-                               print "</strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
+                               print "</strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
                        } else {
                                printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
@@ -127,7 +129,7 @@ sub MakeBuglist() {
 }
 
 
-sub MakeStatistics() {
+sub MakeStatistics {
        my $bugcount=0;         # Total number of bugs so far
        my $patchtotal=0;       # Total number of bugs marked patch
        my $pendingtotal=0;     # Total number of bugs marked pending
@@ -135,14 +137,18 @@ sub MakeStatistics() {
        my $worrytotal=0;       # Total number of bugs we're actually worried about
        my $stabletotal=0;      # Total number of bugs affecting stable
        my %list;               # List of bugnumber associated with package
+        my %seen_bugs;          # bugs which have already been counted
 
        for my $p (sort keys %scanlib::packagelist) {
                my $count = 0;          # Number of bugs for this package
 
                for my $nr (@{$scanlib::packagelist{$p}}) {
+                    # if we've already counted this bug, we don't want to count it again
+                    next if $seen_bugs{$nr};
+                    $seen_bugs{$nr} = 1;
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
-                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
@@ -152,12 +158,12 @@ sub MakeStatistics() {
        }
 
        if ($html) {
-               print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
+               print "<strong><font color=\"red\">Total number of release-critical bugs</font>:</strong> $bugcount<BR>\n";
                printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
                printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
                printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);
-               printf("<strong>Number concerning the current stable release:</strong> %d<BR>\n", $stabletotal);
-               printf("<strong>Number concerning the next release:</strong> %d<P>\n", $worrytotal);
+               printf("<strong><font color=\"blue\">Number concerning the current stable release</font>:</strong> %d<BR>\n", $stabletotal);
+               printf("<strong><font color=\"green\">Number concerning the next release</font>:</strong> %d<P>\n", $worrytotal);
        } else {
                print "Total number of release-critical bugs: $bugcount\n";
                printf("Number that have a patch: %d\n", $patchtotal);
@@ -206,7 +212,7 @@ FilterPackages($opt_d) if ($opt_d);
 FilterBugsStable() if ($opt_b);
 FilterBugs() if ($opt_t);
 
-MakeStatistics if ($opt_s);
+MakeStatistics() if ($opt_s);
 if ($opt_l) {
        MakeBuglist();
 }