Merge from mainline.

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 3dca704000de24c6dfc17caa78410b7cde07edaf..9bd84581e59d1292a3dfd49662a91e2362ebfa83 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# vim: ts=4 sw=4 nowrap
+# vim: ts=8 sw=8 nowrap
 #
 # General functions for scanning the BTS-database.
 # Based on bugscan, written by Richard Braakman <dark@debian.org>,
@@ -174,14 +174,15 @@ sub scanspooldir() {
                next if $skip==1;
        
                my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^woody$/, @tags);
-               $disttags{'stable'}       = grep(/^sarge$/, @tags);
-               $disttags{'testing'}      = grep(/^etch$/, @tags);
+               $disttags{'oldstable'}    = grep(/^sarge$/, @tags);
+               $disttags{'stable'}       = grep(/^etch$/, @tags);
+               $disttags{'testing'}      = grep(/^lenny$/, @tags);
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
-               # default according to dondelelcaro 2006-11-11
+               # default according to vorlon 2007-06-17
                if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+                       $disttags{'stable'} = 1;
                        $disttags{'testing'} = 1;
                        $disttags{'unstable'} = 1;
                        $disttags{'experimental'} = 1;
@@ -224,8 +225,8 @@ sub scanspooldir() {
                        next if !$affects_any;
                }
 
-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
-                       $bi->{$keyword} = ($bug->{'keywords'} =~ /\b$keyword\b/) ? 1 : 0;
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
+                       $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
                if (length($bug->{'mergedwith'})) {
@@ -316,13 +317,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 +337,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;
 }