Count RC bugs in stable.

diff --git a/bugcounts b/bugcounts
index 3051b19a9074df34c68b5c1ceed5f52d50a3ffa2..de473a18011984c2452f9610256640f4c017a3ea 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -43,6 +43,7 @@ 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 $worrycount=0;      # Number of bugs we're actually worried about
+my $stablecount=0;     # Number of bugs affecting stable
 
 for my $p (keys %scanlib::packagelist) {
        next if (defined $bugcfg::exclude{$p});
@@ -53,7 +54,8 @@ for my $p (keys %scanlib::packagelist) {
                $patchcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
                $ignorecount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
                $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
+               $stablecount++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
        }
 }
 
-printf("%d %d %d 0 %d 0 %d\n", $total, $pendingcount, $patchcount, $ignorecount, $worrycount);
+printf("%d %d %d 0 %d 0 %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $worrycount, $stablecount);

diff --git a/bugreport b/bugreport
index 123a5b067d11cda1bef1c40b27c42d06eb10daff..8bb3b5835a0b0f0f01fbf3a34436d95e115d7d2d 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -132,6 +132,7 @@ sub MakeStatistics() {
        my $pendingtotal=0;     # Total number of bugs marked pending
        my $ignoretotal=0;      # Total number of bugs marked ignore
        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
 
        for my $p (sort keys %scanlib::packagelist) {
@@ -143,6 +144,7 @@ sub MakeStatistics() {
                        $patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
                        $ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
+                       $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
                        if (not defined($scanlib::exclude{$nr})) {
                                $bugcount++;
@@ -156,13 +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<P>\n", $worrytotal);
+               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);
        } 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);
        }
 }
 

diff --git a/dograph b/dograph
index d85ee532028c5c282f8cfa1743e1b2a3bf789755..a005901e4e4c3463251caab58397354310cddd37 100755 (executable)
--- a/dograph
+++ b/dograph
@@ -6,11 +6,14 @@ cd /home/sesse/bugscan
 
 tmp=`tempfile`
 tmp2=`tempfile`
+tmp3=`tempfile`
 
 find counts -type f | sort | xargs grep '^' /dev/null |
     sed 's/^.*count-//;s/ .*$//;s/:/ /' >"$tmp"
-find counts -type f | sort | xargs egrep '^(.* ){6}' /dev/null |
-    sed 's/^.*count-//;s/:.* / /;' >"$tmp2"
+find counts -type f | sort | xargs egrep '^(.* ){6}' /dev/null | tr ":-" " " |
+    cut -d" " -f2,9 >"$tmp2"
+find counts -type f | sort | xargs egrep '^(.* ){7}' /dev/null | tr ":-" " " |
+    cut -d" " -f2,10 >"$tmp3"
 
 #for i in counts/count-[0-9]* ; do
 #      date=`echo $i | sed -e s/.*count-//`
@@ -29,7 +32,7 @@ set yrange [0:]
 #set xtics 2678400
 #set nomxtics
 set output "/home/sesse/bugscan/www/graph.png"
-plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
 quit
 EOF
 

diff --git a/scanlib.pm b/scanlib.pm
index 398687ba0e4011762e49dfdec80fc0fb2d4a2c49..ed9fd37dd022f2ccfeb856dbc1f142b0ce60c7e0 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -319,4 +319,13 @@ sub check_worry {
        return 1;
 }
 
+sub check_worry_stable {
+       my ($status) = @_;
+
+       if ($status !~ m/ \[[^]]*S/) {
+               return 0;
+       }
+       return 1;
+}
+
 1;