X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=47f8baf642c8d18b5f081589a0c557341ee2f409;hp=4705946cc776ae35b0d2e6a31f3cc9d75f93055c;hb=e6018e62ab349664b43d9f5c605b05b09f690670;hpb=98ad74eb8cdf3ce584e496e65d6ea6b2af67cde1

diff --git a/scanlib.pm b/scanlib.pm
index 4705946..47f8baf 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -19,6 +19,7 @@ use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Packages;
 use Debbugs::Versions;
 use Debbugs::Status;
+use IO::Uncompress::AnyUncompress;
 use Fcntl qw(O_RDONLY);
 
 use File::Basename;
@@ -50,24 +51,27 @@ sub readmaintainers() {
 	close(M);
 }
 
+sub glob_compressed_fh {
+    my ($fn) = @_;
+    $fn = (grep { -f $_ } glob $fn)[0];
+    my $fh = IO::Uncompress::AnyUncompress->new($fn) 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);
 	}
 }
 
@@ -75,23 +79,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
@@ -101,12 +102,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>) {