Change the format of the status file to be something much closer to the

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index 8bb3b5835a0b0f0f01fbf3a34436d95e115d7d2d..eee96b3019c17c56cca8fcba2a51be2b5c1bd9cc 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -140,9 +140,9 @@ sub MakeStatistics() {
 
                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}->{'etch-ignore'});
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
@@ -158,15 +158,15 @@ sub MakeStatistics() {
                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 next release (excluding ignored and not-in-testing):</strong> %d<BR>\n", $worrytotal);
-               printf("<strong>Number concerning the current stable release:</strong> %d<P>\n", $stabletotal);
+               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);
        } 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 next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
                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);
        }
 }