The following commit has been merged in the archive-master branch:
commit 34728f0ea88eef1aab0c5fa1d369e1d6874265d7
Merge: 9083dcf3a523120cfb4cd905d26dada501678aea
13bd5c195c09556542474ba98768934a937daace
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Wed Oct 29 12:22:17 2008 +0100
Merge commit 'origin/master' into archive-master
Conflicts:
config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_volatile
static/index.tmpl
diff --combined cron.d/120synctrans
index 5bfd959,a40736f..705d7d0
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@@ -12,7 -12,7 +12,7 @@@ the
ddtp_ftpsite="$ftpsite"
fi
echo using remote mirror $ddtp_ftpsite
- for dist in $dists
+ for dist in sid
do
for part in main
do
@@@ -28,7 -28,7 +28,7 @@@
done
else
echo using local mirror
- for dist in $dists
+ for dist in sid
do
for part in main
do
@@@ -43,3 -43,5 +43,5 @@@
done
done
fi
+
+ exit 0
diff --combined lib/Packages/Dispatcher.pm
index 35b0459,e2771b9..0856ef4
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -64,11 -64,10 +64,10 @@@ sub do_dispatch
delete $ENV{'LC_ALL'};
delete $ENV{'LC_MESSAGES'};
- my %SUITES_ALIAS = ( oldstable => 'sarge',
+ my %SUITES_ALIAS = ( #oldstable => 'sarge',
stable => 'etch',
testing => 'lenny',
unstable => 'sid',
- '3.1' => 'sarge',
'4.0' => 'etch' );
# Read in all the variables set by the form
@@@ -94,7 -93,7 +93,7 @@@
&Packages::DB::init();
my $last_modified = $Packages::DB::db_read_time;
my $now = time;
- my $expires = $last_modified + (12*3600);
+ my $expires = $last_modified + (365*24*3600);
$expires = $now + 3600 if $expires < $now;
# allow some fudge, since the db mod time is not the end of
# the cron job
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
