ignore undefined values when we filter

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 7451d88be2826ba6bbebc9b9c662c1325b06f243..96aee35a063b6768be7f589e713a4cff6bf4ef89 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -177,9 +177,9 @@ sub scanspooldir() {
                next if $skip==1;
        
                my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^sarge$/, @tags);
-               $disttags{'stable'}       = grep(/^etch$/, @tags);
-               $disttags{'testing'}      = grep(/^lenny$/, @tags);
+               $disttags{'oldstable'}    = grep(/^etch$/, @tags);
+               $disttags{'stable'}       = grep(/^lenny$/, @tags);
+               $disttags{'testing'}      = grep(/^squeeze$/, @tags);
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
@@ -228,7 +228,7 @@ sub scanspooldir() {
                        next if !$affects_any;
                }
 
-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore) {
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
@@ -238,7 +238,7 @@ sub scanspooldir() {
                }
 
                for my $package (split /[,\s]+/, $bug->{'package'}) {
-                       $_= $package; y/A-Z/a-z/; $_= $` if m/[^-+._a-z0-9]/;
+                       $_= $package; y/A-Z/a-z/; $_= $` if m/[^-+._:a-z0-9]/;
                        push @{$packagelist{$_}}, $f;
                }
 
@@ -320,13 +320,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
-       return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
+       return ($bi->{'testing'} && !$bi->{'squeeze-ignore'});
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'} && !$bi->{'etch-ignore'});
+       return ($bi->{'stable'} && !$bi->{'lenny-ignore'});
 }
 
 sub check_worry_unstable {
@@ -346,7 +346,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
-       $taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{'lenny-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }