From: Frank Lichtenheld Date: Tue, 19 Aug 2008 21:59:41 +0000 (+0200) Subject: Merge branch 'master' into archive-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=1d7caad10f40cd0a997c026b47c699b69f7c75d5;p=deb%2Fpackages.git Merge branch 'master' into archive-master Conflicts: config.sh.sed.in lib/Packages/Dispatcher.pm --- 1d7caad10f40cd0a997c026b47c699b69f7c75d5 diff --cc config.sh.sed.in index 4931dbc,111cabc..645853f --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -24,8 -24,13 +24,8 @@@ localdir=/srv/archive.debian.org/ft # path to private ftp directory #ftproot=/org/ftp.root -ftpsite=http://ftp.de.debian.org/debian -security_ftpsite=http://security.debian.org/debian-security -volatile_ftpsite=http://volatile.debian.org/debian-volatile -backports_ftpsite=http://backports.org/debian -amd64_ftpsite=http://amd64.debian.net/debian -debports_ftpsite=http://ftp.debian-ports.org/debian +ftpsite=http://archive.debian.org/debian-archive - ddtp_ftpsite=http://ddtp.debian.net/debian + ddtp_ftpsite= wget_cmd="wget --no-verbose --tries=2 --timeout=60" check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg" diff --cc lib/Packages/Dispatcher.pm index 7ded77e,d8b750c..35b0459 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@@ -94,9 -94,11 +94,11 @@@ sub do_dispatch &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 - $last_modified = $now if $last_modified - $now < 3600; + $last_modified = $now if $now - $last_modified < 3600; if ($input->http('If-Modified-Since') and (my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {