X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=bin%2Fparse-contents;h=959b6101b8e8e9478a11dd3222e886ecf1904f62;hb=e46ca864f95817099aab4d1251c8773e7b51b10f;hp=a72bb71aefac3e96a904993764e3065062f4b7c1;hpb=24c23c4eebaf4fa86fd27f1c65fa3f220ce30059;p=deb%2Fpackages.git

diff --git a/bin/parse-contents b/bin/parse-contents
index a72bb71..959b610 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -46,6 +46,8 @@ use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
+my %deborts_hash;
+@deborts_hash{qw( alpha avr32 hppa m68k powerpcspe sh4 sparc64 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );
@@ -85,9 +87,11 @@ for my $suite (@suites) {
 
 		open CONT, "zcat $filename|$what"
 		    or die $!;
-		while (<CONT>) { last if /^FILE/mo; }
-		if (eof(CONT)) { # no header found
+		my $header_found = 0;
+		while (<CONT>) { /^FILE/mo && do { $header_found = 1; last };}
+		if (eof(CONT)) { # no header found or only header found
 		    close CONT; # explicit close to reset $.
+		    next if $header_found;
 		    open CONT, "zcat $filename|$what";
 		}
 		while (<CONT>) {
@@ -142,7 +146,7 @@ for my $suite (@suites) {
 
 	    activate($filelist_db);
 	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
-	    if ($arch ne 'm68k') {
+	    if (not exists $deborts_hash{$arch}) {
 		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";