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

diff --git a/bin/parse-contents b/bin/parse-contents
index a72bb71..ac88420 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -85,9 +85,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 +144,7 @@ for my $suite (@suites) {
 
 	    activate($filelist_db);
 	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
-	    if ($arch ne 'm68k') {
+	    if ($arch ne 'avr32' and $arch ne 'm68k') {
 		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";