The following commit has been merged in the ubuntu-master branch:
commit 6adaf6e202571324a5a430b0be8fe90d34105706
Merge: 56ba156255307e6b0f02833198994a144a25c1ee
66e13e020e7b338272a4516e3773c100826732c2
Author: Gerfried Fuchs <rho...@debian.org>
Date: Tue Jun 28 08:06:42 2011 +0200
Merge branch 'master' into ubuntu-master
diff --combined bin/parse-contents
index 22a72e8,16bc7e4..959b610
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@@ -47,7 -47,7 +47,7 @@@ my @archives = @ARCHIVES
my @suites = @SUITES;
my @archs = @ARCHITECTURES;
my %deborts_hash;
- @deborts_hash{qw( avr32 m68k powerpcspe sh4 sparc64 )} = ();
+ @deborts_hash{qw( alpha avr32 hppa m68k powerpcspe sh4 sparc64 )} = ();
$DBDIR .= "/contents";
mkdirp( $DBDIR );
@@@ -87,11 -87,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>) {
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
