X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=bin%2Fparse-contents;h=ac88420da74c5834f7e4304533248509e355ac68;hb=0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6;hp=82df0b87b74341795df60a232670cd17ded0b9fc;hpb=52f0086a17ba7e484857d78f90cda00b8360697b;p=deb%2Fpackages.git diff --git a/bin/parse-contents b/bin/parse-contents index 82df0b8..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 () { last if /^FILE/mo; } - if (eof(CONT)) { # no header found + my $header_found = 0; + while () { /^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 () { @@ -142,7 +144,7 @@ for my $suite (@suites) { activate($filelist_db); #FIXME: hardcoded archs. (debports has no contrib/non-free) - if ($arch !~ m/^kfreebsd-.*$/) { + if ($arch ne 'avr32' and $arch ne 'm68k') { system("ln", "-sf", basename($filelist_db), "$DBDIR/filelists_${suite}_all.db") == 0 or die "Oops";