From: Steinar H. Gunderson <sesse@rietz>
Date: Sun, 17 Jun 2007 15:59:20 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=ba928af3f693d3d4fc348c4d1395967fbddd04b1;hp=-c

Merge from mainline.
---

ba928af3f693d3d4fc348c4d1395967fbddd04b1
diff --combined scanlib.pm
index a9b4a04,4ef4191..9bd8458
--- a/scanlib.pm
+++ b/scanlib.pm
@@@ -174,15 -174,14 +174,15 @@@ 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);
  			
 -		# default according to dondelelcaro 2006-11-11
 +		# default according to vorlon 2007-06-17
  		if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
 +			$disttags{'stable'} = 1;
  			$disttags{'testing'} = 1;
  			$disttags{'unstable'} = 1;
  			$disttags{'experimental'} = 1;
@@@ -225,7 -224,7 +225,7 @@@
  			next if !$affects_any;
  		}
  
- 		for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
+ 		for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
  			$bi->{$keyword} = grep(/^$keyword$/, @tags);
  		}
  
@@@ -317,13 -316,13 +317,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 {
@@@ -337,7 -336,7 +337,7 @@@
  	$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;
  }