Merge commit 'origin/master' into archive-master

[deb/packages.git] / lib / Packages / Dispatcher.pm

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index d8b750c18d784604f2d37d461b16e50c543ede97..0856ef4e4d9a458e00bb0a3a8ffd7b30ec6b5409 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,11 +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 @@ 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