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

diff --git a/scanlib.pm b/scanlib.pm
index 43cfb8d..4c6b09b 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -182,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
@@ -200,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'}));
@@ -208,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;
@@ -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) {
+		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->{'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 {
@@ -352,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;
 }
@@ -361,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};
 	}