The following commit has been merged in the ubuntu-master branch:
commit 0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6
Merge: a3a30de1bd4be8a1812a7f74df5990da26008446
d2c37ad5a233f2026d3309905f6715ec672be45b
Author: Frank Lichtenheld <fr...@lichtenheld.de>
Date: Sun Jun 7 21:56:42 2009 +0200
Merge branch 'master' into ubuntu-master
Conflicts:
config.sh.sed.in
cron.d/100syncarchive_debports
static/index.tmpl
templates/config/mirrors.tmpl
diff --combined bin/parse-contents
index 26f7151,11d076f..ac88420
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@@ -85,11 -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>) {
@@@ -144,7 -142,7 +144,7 @@@
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";
--
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
