X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=4ef4191d28b25d73bd02204c5d4dd60e9df2a652;hp=90b8cc81481c49a4f7ede9e56f90d87d1d66f1a2;hb=2076316f9eac086043f75fad2729a58cc067cf08;hpb=4f12e472fcb5368558b24cae416028a3e3e31648

diff --git a/scanlib.pm b/scanlib.pm
index 90b8cc8..4ef4191 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -174,9 +174,9 @@ sub scanspooldir() {
 		next if $skip==1;
 	
 		my %disttags = ();	
-		$disttags{'oldstable'}    = grep(/^woody$/, @tags);
-		$disttags{'stable'}       = grep(/^sarge$/, @tags);
-		$disttags{'testing'}      = grep(/^etch$/, @tags);
+		$disttags{'oldstable'}    = grep(/^sarge$/, @tags);
+		$disttags{'stable'}       = grep(/^etch$/, @tags);
+		$disttags{'testing'}      = grep(/^lenny$/, @tags);
 		$disttags{'unstable'}     = grep(/^sid$/, @tags);
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
 			
@@ -224,8 +224,8 @@ sub scanspooldir() {
 			next if !$affects_any;
 		}
 
-		for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
-			$bi->{$keyword} = ($bug->{'keywords'} =~ /\b$keyword\b/) ? 1 : 0;
+		for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
+			$bi->{$keyword} = grep(/^$keyword$/, @tags);
 		}
 
 		if (length($bug->{'mergedwith'})) {
@@ -316,13 +316,13 @@ sub wwwname() {
 sub check_worry {
 	my ($bi) = @_;
 
-	return ($bi->{'testing'} && !$bi->{'etch-ignore'});
+	return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
 }
 
 sub check_worry_stable {
 	my ($bi) = @_;
 
-	return ($bi->{'stable'} && !$bi->{'sarge-ignore'});
+	return ($bi->{'stable'} && !$bi->{'etch-ignore'});
 }
 
 sub get_taginfo {
@@ -336,7 +336,7 @@ sub get_taginfo {
 	$taginfo .= $bi->{'unreproducible'} ? "R" : " ";
 	$taginfo .= $bi->{'security'}       ? "S" : " ";
 	$taginfo .= $bi->{'upstream'}       ? "U" : " ";
-	$taginfo .= ($bi->{'sarge-ignore'} || $bi->{'etch-ignore'}) ? "I" : " ";
+	$taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }