Remove an obsolete explanation for how the testing RC count is computed.

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index 001ce2f84adb4ed9ae3003c9f7d1952adc6e0797..75654cc9b5b42eada2fa54cbdd8b5dc7137a2b71 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -85,10 +85,8 @@ sub MakeBuglist() {
        my $header;             # Flag if packagename has already been printed
 
        for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
-               next if (defined $bugcfg::exclude{$p});
                $header = 0;
                for $nr (sort @{$scanlib::packagelist{$p}}) {
-                       next if (defined $bugcfg::exclude{$nr});
                        if (! $header) {
                                $header = 1;
                                &PrintPackageHeader($p);
@@ -97,27 +95,29 @@ sub MakeBuglist() {
                        if ($html) {
                                my $worry = scanlib::check_worry($scanlib::bugs{$nr});
                        
-                               if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-                                       print '<span style="color: #808080">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
+                               if ($scanlib::bugs{$nr}->{'pending'}) {
                                        print '<span style="color: #f040d0">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
+                               } elsif ($scanlib::bugs{$nr}->{'patch'}) {
                                        print '<span style="color: #00aa00">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
+                               } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }
-                               print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+                               print "<strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-                               print "<A NAME=\"$nr\"></A>  " . scanlib::wwwnumber($nr) . ' ' .
-                                         scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n";
+                               printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
+                                       scanlib::get_taginfo($scanlib::bugs{$nr}),
+                                       scanlib::get_relinfo($scanlib::bugs{$nr}), 
+                                       scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
                                print "</em>" if $worry;
-                               print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
+                               print "</strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
                        } else {
-                               printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
+                               printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
+                                       scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
                        }
-                       print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-                                                     $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
+                       print "</span>" if ($html && ($scanlib::bugs{$nr}->{'pending'} ||
+                                                     $scanlib::bugs{$nr}->{'patch'} ||
+                                                                                 $scanlib::bugs{$nr}->{'help'}));
                }
                if ($header) {
                        &PrintPackageFooter($p);
@@ -138,18 +138,15 @@ sub MakeStatistics() {
        for my $p (sort keys %scanlib::packagelist) {
                my $count = 0;          # Number of bugs for this package
 
-               next if (defined $scanlib::exclude{$p});
                for my $nr (@{$scanlib::packagelist{$p}}) {
-                       $pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
-                       $patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
-                       $ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
+                       $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
+                       $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
-                       if (not defined($scanlib::exclude{$nr})) {
-                               $bugcount++;
-                               $count++;
-                       } 
+                       $bugcount++;
+                       $count++;
                }
        }
 
@@ -159,14 +156,14 @@ sub MakeStatistics() {
                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 (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
+               printf("<strong>Number concerning the next release:</strong> %d<P>\n", $worrytotal);
        } else {
                print "Total number of release-critical bugs: $bugcount\n";
                printf("Number that have a patch: %d\n", $patchtotal);
                printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal);
                printf("Number that are being ignored: %d\n", $ignoretotal);
-               printf("Number concerning the current stable release: %d<P>\n", $stabletotal);
-               printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
+               printf("Number concerning the current stable release: %d\n", $stabletotal);
+               printf("Number concerning the next release: %d\n", $worrytotal);
        }
 }