Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/bugscan

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index 22f4775cc3df22b417109e4276de9a760c6e8610..49bcc929a05a1abbec2af76efb3de7ebbba058f6 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -135,11 +135,15 @@ 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}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
@@ -152,12 +156,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);