fix lack of oldstable in disttags

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 6978dae17c0d83fb382ec9596fd5ce559580b2c8..4c6b09bf03a8fab543e246e117c6e3889f4aae2a 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -66,16 +66,10 @@ sub readsources() {
        }
 }
 
-sub readpackages() {
-       my $root;                                       # Root of archive we are scanning
-       my $archive;                            # Name of archive we are scanning
-       my $sect;                                       # Name of current section
-       my $arch;                                       # Name of current architecture
-
-       $root=shift;
-       $archive=shift;
-       for $arch ( @bugcfg::architectures ) {
-               for $sect ( @bugcfg::sections) {
+sub readpackages {
+    my ($root,$archive) = @_;
+       for my $arch ( @bugcfg::architectures ) {
+               for my $sect ( @bugcfg::sections) {
                        open(P, "zcat $root/$sect/binary-$arch/Packages.gz|")
                                or die "open: $root/$sect/binary-$arch/Packages.gz: $!\n";
                        while (<P>) {
@@ -88,6 +82,18 @@ sub readpackages() {
                        close(P);
                }
        }
+    # handle the source packages
+    for my $sect (@bugcfg::sections) {
+       my $fh;
+       open($fh,'-|','zcat',"$root/$sect/source/Sources.gz") or
+           die "Unable to open zcat $root/$sect/source/Sources.gz for reading: $!";
+       while (<$fh>) {
+           chomp;
+           next unless m/^Package:\s/; # We're only interested in the packagenames
+           s/^Package:\s*//;                   # Strip the fieldname
+           $section{$_} = "$archive/$sect";
+       }
+    }
 }
 
 sub readdebbugssources() {
@@ -176,11 +182,10 @@ sub scanspooldir {
                }
                next if $skip==1;
        
-               my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^etch$/, @tags);
-               $disttags{'stable'}       = grep(/^lenny$/, @tags);
-               $disttags{'testing'}      = grep(/^squeeze$/, @tags);
-               $disttags{'unstable'}     = grep(/^sid$/, @tags);
+               my %disttags = ();
+        for (qw(oldstable stable testing unstable)) {
+            $disttags{$_}    = grep(/^$bug_cfg::debian_releases->{$_}$/, @tags);
+        }
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
                # default according to vorlon 2007-06-17
@@ -194,7 +199,7 @@ sub scanspooldir {
                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) {
+                       for my $dist (qw(oldstable stable testing unstable experimental)) {
                                $bi->{$dist} = $disttags{$dist};
                        }
                        next if (length($bug->{'done'}));
@@ -202,7 +207,7 @@ sub scanspooldir {
                        my $affects_any = 0;
                
                        # only bother to check the versioning status for the distributions indicated by the tags 
-                       for my $dist qw(oldstable stable testing unstable experimental) {
+                       for my $dist (qw(oldstable stable testing unstable experimental)) {
                                local $SIG{__WARN__} = sub {};
 
                                $bi->{$dist} = 0;
@@ -228,7 +233,8 @@ 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),
+                         map {$_.$bug_cfg::debian_releases->{testing}.'-ignore'} keys %{$bug_cfg::debian_releases}) {
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
@@ -320,13 +326,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
-       return ($bi->{'testing'} && !$bi->{'squeeze-ignore'});
+       return ($bi->{'testing'} && !$bi->{$bug_cfg::debian_releases->{testing}.'-ignore'});
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'} && !$bi->{'lenny-ignore'});
+       return ($bi->{'stable'} && !$bi->{$bug_cfg::debian_releases->{stable}.'-ignore'});
 }
 
 sub check_worry_unstable {
@@ -346,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->{$bug_cfg::debian_releases->{stable}.'-ignore'} || $bi->{$bug_cfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }
@@ -355,7 +361,7 @@ sub get_relinfo {
     my $bi = shift;
 
     my $relinfo = "";
-       for my $dist qw(oldstable stable testing unstable experimental) {
+       for my $dist (qw(oldstable stable testing unstable experimental)) {
            $relinfo .= uc(substr($dist, 0, 1)) if $bi->{$dist};
        }