Apply the "default testing/unstable/experimental" tags strategy to

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 83e4b601fca414f90847e42e6fe3396174129ba3..b1bd14cedbd6a006156419b58aafa28ee89dd4da 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -215,23 +215,23 @@ sub scanspooldir() {
                $disttags{'testing'}      = grep(/^etch$/, @tags);
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
+                       
+               # default according to dondelelcaro 2006-11-11
+               if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+                       $disttags{'testing'} = 1;
+                       $disttags{'unstable'} = 1;
+                       $disttags{'experimental'} = 1;
+               }
                
                my $relinfo = "";
-               warn $section{$bug->{'package'}};
-               if ($section{$bug->{'package'}} eq 'pseudo') {
+               if (defined($section{$bug->{'package'}}) && $section{$bug->{'package'}} eq 'pseudo') {
                        # versioning information makes no sense for pseudo packages,
                        # just use the tags
                        for my $dist qw(oldstable stable testing unstable experimental) {
                                $relinfo .= uc(substr($dist, 0, 1)) if $disttags{$dist};
                        }
+                       next if (length($bug->{'done'}));
                } else {
-                       # default according to dondelelcaro 2006-11-11
-                       if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
-                               $disttags{'testing'} = 1;
-                               $disttags{'unstable'} = 1;
-                               $disttags{'experimental'} = 1;
-                       }
-
                        # only bother to check the versioning status for the distributions indicated by the tags 
                        for my $dist qw(oldstable stable testing unstable experimental) {
                                local $SIG{__WARN__} = sub {};
@@ -397,7 +397,7 @@ sub check_worry {
 
        if ($status =~ m/^\[[^]]*I/ or
            $status =~ m/ \[[^]]*X/ or
-            ($status =~ m/ \[[^]]*[OSUE]/ and $status !~ m/ \[[^]]*T/)) {
+            $status !~ m/ \[[^]]*T/) {
                return 0;
        }
        return 1;