use warnings and strict

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 2982284a5d019a0ea3b2b73cb5ccb23974347a53..4705946cc776ae35b0d2e6a31f3cc9d75f93055c 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -10,6 +10,9 @@
 #   %section        - map from packagename to section in the FTP-site
 #   %packagelist    - map from packagename to bugreports
 
+use warnings;
+use strict;
+
 use lib qw(/org/bugs.debian.org/perl);
 use LWP::UserAgent;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
@@ -17,9 +20,11 @@ use Debbugs::Packages;
 use Debbugs::Versions;
 use Debbugs::Status;
 use Fcntl qw(O_RDONLY);
-use strict;
-use warnings;
-require bugcfg;
+
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+
 package scanlib;
 
 our (%maintainer,%section,%packagelist,%debbugssection,%bugs);
@@ -182,11 +187,10 @@ sub scanspooldir {
                }
                next if $skip==1;
        
-               my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^lenny$/, @tags);
-               $disttags{'stable'}       = grep(/^squeeze$/, @tags);
-               $disttags{'testing'}      = grep(/^wheezy$/, @tags);
-               $disttags{'unstable'}     = grep(/^sid$/, @tags);
+               my %disttags = ();
+        for my $release (qw(oldstable stable testing unstable)) {
+            $disttags{$release}    = grep(/^$bugcfg::debian_releases->{$release}$/, @tags);
+        }
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
                # default according to vorlon 2007-06-17
@@ -234,7 +238,8 @@ sub scanspooldir {
                        next if !$affects_any;
                }
 
-               for my $keyword (qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore wheezy-ignore)) {
+               for my $keyword (qw(pending patch help moreinfo unreproducible security upstream),
+                         map {$bugcfg::debian_releases->{$_}.'-ignore'} keys %{$bugcfg::debian_releases}) {
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
@@ -326,13 +331,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
-       return ($bi->{'testing'} && !$bi->{'wheezy-ignore'});
+       return ($bi->{'testing'} && !$bi->{$bugcfg::debian_releases->{testing}.'-ignore'});
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'} && !$bi->{'squeeze-ignore'});
+       return ($bi->{'stable'} && !$bi->{$bugcfg::debian_releases->{stable}.'-ignore'});
 }
 
 sub check_worry_unstable {
@@ -352,7 +357,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
-       $taginfo .= ($bi->{'wheezy-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{$bugcfg::debian_releases->{stable}.'-ignore'} || $bi->{$bugcfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }