handle the release of squeeze and wheezy being the new testing

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 43cfb8d985d63aacfa1a968d0e6bca805b60dd6d..60e4cf47837d454823a022f86de99c08b47f2962 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -183,9 +183,9 @@ sub scanspooldir {
                next if $skip==1;
        
                my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^etch$/, @tags);
-               $disttags{'stable'}       = grep(/^lenny$/, @tags);
-               $disttags{'testing'}      = grep(/^squeeze$/, @tags);
+               $disttags{'oldstable'}    = grep(/^lenny$/, @tags);
+               $disttags{'stable'}       = grep(/^squeeze$/, @tags);
+               $disttags{'testing'}      = grep(/^wheezy$/, @tags);
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
@@ -234,7 +234,7 @@ sub scanspooldir {
                        next if !$affects_any;
                }
 
-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore) {
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore wheezy-ignore) {
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
@@ -326,13 +326,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
-       return ($bi->{'testing'} && !$bi->{'squeeze-ignore'});
+       return ($bi->{'testing'} && !$bi->{'wheezy-ignore'});
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'} && !$bi->{'lenny-ignore'});
+       return ($bi->{'stable'} && !$bi->{'squeeze-ignore'});
 }
 
 sub check_worry_unstable {
@@ -352,7 +352,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
-       $taginfo .= ($bi->{'lenny-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{'wheezy-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }