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

diff --git a/scanlib.pm b/scanlib.pm
index 4c6b09b..9171f84 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -10,16 +10,22 @@
 #   %section        - map from packagename to section in the FTP-site
 #   %packagelist    - map from packagename to bugreports
 
+use warnings;
+use strict;
+
 use lib qw(/org/bugs.debian.org/perl);
 use LWP::UserAgent;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Packages;
 use Debbugs::Versions;
 use Debbugs::Status;
+use Debbugs::Common qw(open_compressed_file);
 use Fcntl qw(O_RDONLY);
-use strict;
-use warnings;
-require bugcfg;
+
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+
 package scanlib;
 
 our (%maintainer,%section,%packagelist,%debbugssection,%bugs);
@@ -45,24 +51,30 @@ sub readmaintainers() {
 	close(M);
 }
 
+sub glob_compressed_fh {
+    my ($fn) = @_;
+    my @fn = grep { -f $_ } glob $fn;
+    if (not @fn) {
+	die "No files exist which match glob '$fn'";
+    }
+    my $fh = Debbugs::Common::open_compressed_file($fn[0]) or
+        die "Unable to open $fn for reading: $!";
+    return $fh;
+}
+
 
-sub readsources() {
-	my $root;					# Root of archive we are scanning
-	my $archive;				# Name of archive we are scanning
-	my $sect;					# Name of current section
+sub readsources {
+    my ($root,$archive) = @_;
 
-	$root=shift;
-	$archive=shift;
-	for $sect (@bugcfg::sections) {
-		open(P, "zcat $root/$sect/source/Sources.gz|")
-			or die open "open: $sect sourcelist: $!\n";
-		while (<P>) {
+	for my $sect (@bugcfg::sections) {
+        my $p = glob_compressed_fh("$root/$sect/source/Sources.*");
+		while (<$p>) {
 			chomp;
 			next unless m/^Package:\s/;
 			s/^Package:\s*//;			# Strip the fieldname
 			$section{$_} = "$archive/$sect";
 		}
-		close (P);
+		close ($p);
 	}
 }
 
@@ -70,23 +82,20 @@ 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>) {
+            my $p = glob_compressed_fh("$root/$sect/binary-$arch/Packages.*");
+			while (<$p>) {
 				chomp;
 				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);
+			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: $!";
+	my $fh = glob_compressed_fh("$root/$sect/source/Sources.*");
 	while (<$fh>) {
 	    chomp;
 	    next unless m/^Package:\s/;	# We're only interested in the packagenames
@@ -96,12 +105,9 @@ sub readpackages {
     }
 }
 
-sub readdebbugssources() {
-	my $file;
-	my $archive;
+sub readdebbugssources {
+    my ($file,$archive) = @_;
 
-	$file=shift;
-	$archive=shift;
 	open(P, $file)
 		or die "open: $file: $!\n";
 	while (<P>) {
@@ -183,8 +189,8 @@ sub scanspooldir {
 		next if $skip==1;
 	
 		my %disttags = ();
-        for (qw(oldstable stable testing unstable)) {
-            $disttags{$_}    = grep(/^$bug_cfg::debian_releases->{$_}$/, @tags);
+        for my $release (qw(oldstable stable testing unstable)) {
+            $disttags{$release}    = grep(/^$bugcfg::debian_releases->{$release}$/, @tags);
         }
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
 			
@@ -234,7 +240,7 @@ sub scanspooldir {
 		}
 
 		for my $keyword (qw(pending patch help moreinfo unreproducible security upstream),
-                         map {$_.$bug_cfg::debian_releases->{testing}.'-ignore'} keys %{$bug_cfg::debian_releases}) {
+                         map {$bugcfg::debian_releases->{$_}.'-ignore'} keys %{$bugcfg::debian_releases}) {
 			$bi->{$keyword} = grep(/^$keyword$/, @tags);
 		}
 
@@ -309,14 +315,14 @@ sub htmlsanit {
     return $in;
 }
 
-sub wwwnumber() {
+sub wwwnumber {
 	my $number = shift;		# Number of bug to html-ize
 
 	"<A HREF=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&amp;bug=" .
 		urlsanit($number) . '">' . htmlsanit($number) . '</A>';
 }
 
-sub wwwname() {
+sub wwwname {
 	my $name = shift;			# Name of package
 
 	"<A HREF=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=no&amp;pkg=" .
@@ -324,15 +330,20 @@ sub wwwname() {
 }
 
 sub check_worry {
-	my ($bi) = @_;
+	my ($bi,$dist) = @_;
+    $dist = 'testing' if not defined $dist;
 
-	return ($bi->{'testing'} && !$bi->{$bug_cfg::debian_releases->{testing}.'-ignore'});
+	return ($bi->{$dist} && !$bi->{$bugcfg::debian_releases->{$dist}.'-ignore'});
 }
 
+sub check_worry_testing {
+    return check_worry($_[0],'testing');
+}
 sub check_worry_stable {
-	my ($bi) = @_;
-
-	return ($bi->{'stable'} && !$bi->{$bug_cfg::debian_releases->{stable}.'-ignore'});
+    return check_worry($_[0],'stable');
+}
+sub check_worry_oldstable {
+    return check_worry($_[0],'oldstable');
 }
 
 sub check_worry_unstable {
@@ -352,7 +363,7 @@ sub get_taginfo {
 	$taginfo .= $bi->{'unreproducible'} ? "R" : " ";
 	$taginfo .= $bi->{'security'}       ? "S" : " ";
 	$taginfo .= $bi->{'upstream'}       ? "U" : " ";
-	$taginfo .= ($bi->{$bug_cfg::debian_releases->{stable}.'-ignore'} || $bi->{$bug_cfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";
+	$taginfo .= ($bi->{$bugcfg::debian_releases->{stable}.'-ignore'} || $bi->{$bugcfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";
 
 	return $taginfo;
 }