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

diff --git a/scanlib.pm b/scanlib.pm
index 4ef4191..60e4cf4 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -66,16 +66,10 @@ sub readsources() {
 	}
 }
 
-sub readpackages() {
-	my $root;					# Root of archive we are scanning
-	my $archive;				# Name of archive we are scanning
-	my $sect;					# Name of current section
-	my $arch;					# Name of current architecture
-
-	$root=shift;
-	$archive=shift;
-	for $arch ( @bugcfg::architectures ) {
-		for $sect ( @bugcfg::sections) {
+sub readpackages {
+    my ($root,$archive) = @_;
+	for my $arch ( @bugcfg::architectures ) {
+		for my $sect ( @bugcfg::sections) {
 			open(P, "zcat $root/$sect/binary-$arch/Packages.gz|")
 				or die "open: $root/$sect/binary-$arch/Packages.gz: $!\n";
 			while (<P>) {
@@ -83,10 +77,23 @@ sub readpackages() {
 				next unless m/^Package:\s/;	# We're only interested in the packagenames
 				s/^Package:\s*//;			# Strip the fieldname
 				$section{$_} = "$archive/$sect";
+				print "$root/$sect/binary-$arch/Packages.gz\n" if ($_ eq 'xtla');
 			}
 			close(P);
 		}
 	}
+    # handle the source packages
+    for my $sect (@bugcfg::sections) {
+	my $fh;
+	open($fh,'-|','zcat',"$root/$sect/source/Sources.gz") or
+	    die "Unable to open zcat $root/$sect/source/Sources.gz for reading: $!";
+	while (<$fh>) {
+	    chomp;
+	    next unless m/^Package:\s/;	# We're only interested in the packagenames
+	    s/^Package:\s*//;			# Strip the fieldname
+	    $section{$_} = "$archive/$sect";
+	}
+    }
 }
 
 sub readdebbugssources() {
@@ -134,13 +141,15 @@ sub scanspool() {
 
 }
 
-sub scanspooldir() {
+sub scanspooldir {
 	my ($dir)		= @_;
 	my $f;			# While we're currently processing
 	my @list;		# List of files to process
 	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";
 
@@ -174,14 +183,15 @@ 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(/^lenny$/, @tags);
+		$disttags{'stable'}       = grep(/^squeeze$/, @tags);
+		$disttags{'testing'}      = grep(/^wheezy$/, @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;
@@ -208,7 +218,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
@@ -224,7 +234,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 wheezy-ignore) {
 			$bi->{$keyword} = grep(/^$keyword$/, @tags);
 		}
 
@@ -234,7 +244,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;
 		}
 
@@ -246,7 +256,7 @@ sub scanspooldir() {
 }
 
 
-sub readstatus() {
+sub readstatus {
     my $filename = shift;
 	open STATUS, "<", $filename
 		or die "$filename: $!";
@@ -273,7 +283,7 @@ sub readstatus() {
 			$bugs{$bug->{'number'}} = $bug;
 
 			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{$_}}, $bug->{'number'};
 			}
 		}
@@ -316,13 +326,19 @@ sub wwwname() {
 sub check_worry {
 	my ($bi) = @_;
 
-	return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
+	return ($bi->{'testing'} && !$bi->{'wheezy-ignore'});
 }
 
 sub check_worry_stable {
 	my ($bi) = @_;
 
-	return ($bi->{'stable'} && !$bi->{'etch-ignore'});
+	return ($bi->{'stable'} && !$bi->{'squeeze-ignore'});
+}
+
+sub check_worry_unstable {
+	my ($bi) = @_;
+
+	return ($bi->{'unstable'});
 }
 
 sub get_taginfo {
@@ -336,7 +352,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->{'wheezy-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }