From 02cc5bba35cc8b9c6ce76a2c1bc7b520187bcaa3 Mon Sep 17 00:00:00 2001
From: Debian BTS <debbugs@rietz>
Date: Tue, 10 Apr 2007 11:31:15 +0000
Subject: [PATCH] Etch is out! Switch to etch/lenny as current/next.

---
 bugcounts  | 2 +-
 bugreport  | 6 +++---
 dohtml     | 2 +-
 dostatus   | 3 ++-
 scanlib.pm | 8 ++++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/bugcounts b/bugcounts
index b53527e..1a84994 100755
--- a/bugcounts
+++ b/bugcounts
@@ -49,7 +49,7 @@ for my $bug (values %scanlib::bugs) {
 	$total++;
 	$pendingcount++ if ($bug->{'pending'});
 	$patchcount++ if ($bug->{'patch'});
-	$ignorecount++ if ($bug->{'sarge-ignore'} || $bug->{'etch-ignore'});
+	$ignorecount++ if ($bug->{'etch-ignore'} || $bug->{'lenny-ignore'});
 	$worrycount++ if (scanlib::check_worry($bug));
 	$stablecount++ if (scanlib::check_worry_stable($bug));
 }
diff --git a/bugreport b/bugreport
index 3b128fd..79c325f 100755
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
 				} elsif ($scanlib::bugs{$nr}->{'help'}) {
 					print '<span style="color: #ffaa30">';
 				}
-				print "<strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+				print "<strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
 				print "<em class=\"worry\">" if $worry;
 				($sect=$nr) =~ s/([0-9]{2}).*/$1/;
 				printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
@@ -111,7 +111,7 @@ sub MakeBuglist() {
 					scanlib::get_relinfo($scanlib::bugs{$nr}), 
 					scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
 				print "</em>" if $worry;
-				print "</strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+				print "</strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
 			} else {
 				printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
 					scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
@@ -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}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+			$ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
 			$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 			$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
diff --git a/dohtml b/dohtml
index 01ad370..bf6ad1b 100755
--- a/dohtml
+++ b/dohtml
@@ -51,7 +51,7 @@ tags</a>:
    <li><strong>R</strong>: unreproducible</li>
    <li><strong>S</strong>: security</li>
    <li><strong>U</strong>: upstream</li>
-   <li><strong>I</strong>: sarge-ignore or etch-ignore</li>
+   <li><strong>I</strong>: etch-ignore or lenny-ignore</li>
 </ul>
 
 <p>
diff --git a/dostatus b/dostatus
index 4f2cf58..ad27f67 100755
--- a/dostatus
+++ b/dostatus
@@ -2,5 +2,6 @@
 
 newtime=`stat --format %y status | cut -d: -f-2`
 echo -n "$newtime (CST): " > /org/bugs.debian.org/www/bugscan/status
-./bugreport -s >> /home/sesse/bugscan/www/status
+./bugreport -s >> /org/bugs.debian.org/www/bugscan/status
+
 
diff --git a/scanlib.pm b/scanlib.pm
index 0f64165..4c76872 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 sarge-ignore etch-ignore) {
+		for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
 			$bi->{$keyword} = grep(/^$keyword$/, @tags);
 		}
 
@@ -316,13 +316,13 @@ sub wwwname() {
 sub check_worry {
 	my ($bi) = @_;
 
-	return ($bi->{'testing'} && !$bi->{'etch-ignore'});
+	return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
 }
 
 sub check_worry_stable {
 	my ($bi) = @_;
 
-	return ($bi->{'stable'} && !$bi->{'sarge-ignore'});
+	return ($bi->{'stable'} && !$bi->{'etch-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->{'sarge-ignore'} || $bi->{'etch-ignore'}) ? "I" : " ";
+	$taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }
-- 
2.39.2