Merge branch '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..6da9b12d8a24ab0b28f9824e591e65ef5fc4e05f 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,12 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
-                        stable => 'etch',
-                        testing => 'lenny',
+    my %SUITES_ALIAS = ( oldstable => 'etch',
+                        stable => 'lenny',
+                        testing => 'squeeze',
                         unstable => 'sid',
-                        '3.1' => 'sarge',
-                        '4.0' => 'etch' );
+                        '4.0' => 'etch',
+                        '5.0' => 'lenny' );
 
     # Read in all the variables set by the form
     my $input;
@@ -94,7 +94,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
@@ -177,7 +177,11 @@ sub do_dispatch {
        } elsif (@components == 0) {
            fatal_error( "We're supposed to display the homepage here, instead of getting dispatch.pl" );
        } elsif (@components == 1) {
-           $what_to_do = 'search';
+           if ($components[0] eq 'index') {
+               $what_to_do = 'homepage';
+           } else {
+               $what_to_do = 'search';
+           }
        } else {
 
            for ($components[-1]) {