Honor the sarge-ignore tag again, now that we have a reasonable framework

for doing it.

diff --git a/bugcounts b/bugcounts
index 038769b2c05c398a62188cdf47868884bd1c5a97..4f2692db439defac949f02c933ba07cb583a729f 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -52,7 +52,7 @@ for my $p (keys %scanlib::packagelist) {
                $total++;
                $pendingcount++ if ($scanlib::bugs{$nr}->{'pending'});
                $patchcount++ if ($scanlib::bugs{$nr}->{'patch'});
-               $ignorecount++ if ($scanlib::bugs{$nr}->{'etch-ignore'});
+               $ignorecount++ if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
                $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                $stablecount++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
        }

diff --git a/bugreport b/bugreport
index eee96b3019c17c56cca8fcba2a51be2b5c1bd9cc..e5db1c7e153dbe7467db3b90c7e7203dcab6536e 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -142,7 +142,7 @@ sub MakeStatistics() {
                for my $nr (@{$scanlib::packagelist{$p}}) {
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
-                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'});
+                       $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}));
 

diff --git a/scanlib.pm b/scanlib.pm
index a2c378b73913439ce72037904f29f30dd8371e34..3dca704000de24c6dfc17caa78410b7cde07edaf 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -224,7 +224,7 @@ sub scanspooldir() {
                        next if !$affects_any;
                }
 
-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore) {
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
                        $bi->{$keyword} = ($bug->{'keywords'} =~ /\b$keyword\b/) ? 1 : 0;
                }
 
@@ -322,7 +322,7 @@ sub check_worry {
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'});
+       return ($bi->{'stable'} && !$bi->{'sarge-ignore'});
 }
 
 sub get_taginfo {
@@ -336,7 +336,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
-       $taginfo .= $bi->{'etch-ignore'}    ? "I" : " ";
+       $taginfo .= ($bi->{'sarge-ignore'} || $bi->{'etch-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }