X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=4c6b09bf03a8fab543e246e117c6e3889f4aae2a;hp=2982284a5d019a0ea3b2b73cb5ccb23974347a53;hb=882c3a5e8e8d32eb965a7d1f805f8ea31668b91c;hpb=8fdaf19c4b53bfa22da01dfb2048ec20a6e6767f

diff --git a/scanlib.pm b/scanlib.pm
index 2982284..4c6b09b 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -182,11 +182,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 (qw(oldstable stable testing unstable)) {
+            $disttags{$_}    = grep(/^$bug_cfg::debian_releases->{$_}$/, @tags);
+        }
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
 			
 		# default according to vorlon 2007-06-17
@@ -234,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 wheezy-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);
 		}
 
@@ -326,13 +326,13 @@ sub wwwname() {
 sub check_worry {
 	my ($bi) = @_;
 
-	return ($bi->{'testing'} && !$bi->{'wheezy-ignore'});
+	return ($bi->{'testing'} && !$bi->{$bug_cfg::debian_releases->{testing}.'-ignore'});
 }
 
 sub check_worry_stable {
 	my ($bi) = @_;
 
-	return ($bi->{'stable'} && !$bi->{'squeeze-ignore'});
+	return ($bi->{'stable'} && !$bi->{$bug_cfg::debian_releases->{stable}.'-ignore'});
 }
 
 sub check_worry_unstable {
@@ -352,7 +352,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->{$bug_cfg::debian_releases->{stable}.'-ignore'} || $bi->{$bug_cfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }