From: Steinar H. Gunderson <sesse@rietz>
Date: Thu, 22 Mar 2007 18:00:53 +0000 (+0000)
Subject: Honor the sarge-ignore tag again, now that we have a reasonable framework
X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=db772de0831e46e460b6446cfab4cc29eff83afa

Honor the sarge-ignore tag again, now that we have a reasonable framework
for doing it.
---

diff --git a/bugcounts b/bugcounts
index 038769b..4f2692d 100755
--- 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 eee96b3..e5db1c7 100755
--- 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 a2c378b..3dca704 100644
--- 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;
 }