X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=96aee35a063b6768be7f589e713a4cff6bf4ef89;hp=50a695102301cc91917d04101824ad94083b1645;hb=1711f575e088f50505776a9ae4f605f9d2d66b5b;hpb=5e9977948a37d9ff7ae73479a72b2b2e01c19b16

diff --git a/scanlib.pm b/scanlib.pm
index 50a6951..96aee35 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -142,6 +142,8 @@ sub scanspooldir() {
 	my $skip;		# Flow control
 	my $walk;		# index variable
 	my $taginfo;	# Tag info
+					
+	my @archs_with_source = ( @bugcfg::architectures, 'source' );
 
 	chdir($dir) or die "chdir $dir: $!\n";
 
@@ -175,9 +177,9 @@ sub scanspooldir() {
 		next if $skip==1;
 	
 		my %disttags = ();	
-		$disttags{'oldstable'}    = grep(/^sarge$/, @tags);
-		$disttags{'stable'}       = grep(/^etch$/, @tags);
-		$disttags{'testing'}      = grep(/^lenny$/, @tags);
+		$disttags{'oldstable'}    = grep(/^etch$/, @tags);
+		$disttags{'stable'}       = grep(/^lenny$/, @tags);
+		$disttags{'testing'}      = grep(/^squeeze$/, @tags);
 		$disttags{'unstable'}     = grep(/^sid$/, @tags);
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
 			
@@ -210,7 +212,7 @@ sub scanspooldir() {
 					bug => $f, 
 					status => $bug, 
 					dist => $dist, 
-					arch => \@bugcfg::architectures
+					arch => \@archs_with_source
 				);
 
 				# ignore bugs that are absent/fixed in this distribution, include everything
@@ -226,7 +228,7 @@ sub scanspooldir() {
 			next if !$affects_any;
 		}
 
-		for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
+		for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore) {
 			$bi->{$keyword} = grep(/^$keyword$/, @tags);
 		}
 
@@ -236,7 +238,7 @@ sub scanspooldir() {
 		}
 
 		for my $package (split /[,\s]+/, $bug->{'package'}) {
-			$_= $package; y/A-Z/a-z/; $_= $` if m/[^-+._a-z0-9]/;
+			$_= $package; y/A-Z/a-z/; $_= $` if m/[^-+._:a-z0-9]/;
 			push @{$packagelist{$_}}, $f;
 		}
 
@@ -318,13 +320,13 @@ sub wwwname() {
 sub check_worry {
 	my ($bi) = @_;
 
-	return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
+	return ($bi->{'testing'} && !$bi->{'squeeze-ignore'});
 }
 
 sub check_worry_stable {
 	my ($bi) = @_;
 
-	return ($bi->{'stable'} && !$bi->{'etch-ignore'});
+	return ($bi->{'stable'} && !$bi->{'lenny-ignore'});
 }
 
 sub check_worry_unstable {
@@ -344,7 +346,7 @@ sub get_taginfo {
 	$taginfo .= $bi->{'unreproducible'} ? "R" : " ";
 	$taginfo .= $bi->{'security'}       ? "S" : " ";
 	$taginfo .= $bi->{'upstream'}       ? "U" : " ";
-	$taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
+	$taginfo .= ($bi->{'lenny-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }