X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=e2123a90c440f96830c12cbd1e9c5a3e256eb56c;hb=d1d4989aab671c948d87bff52d3b8fdead63387a;hp=e8f0679434c67c55cb41a4f4494f03c09f2e6763;hpb=d3d569984446740ede7b0dddc08ba9e80ebdb878;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e8f0679..e2123a9 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,15 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
-			 stable => 'etch',
-			 testing => 'lenny',
+    my %SUITES_ALIAS = ( oldstable => 'lenny',
+			 stable => 'squeeze',
+			 testing => 'wheezy',
 			 unstable => 'sid',
-			 '3.1' => 'sarge',
-			 '4.0' => 'etch' );
+			 'rc-buggy' => 'experimental',
+			 '5.0' => 'lenny',
+			 '6.0' => 'squeeze',
+			 'oldstable-backports' => 'lenny-backports',
+			 'stable-backports' => 'squeeze-backports' );
 
     # Read in all the variables set by the form
     my $input;
@@ -94,9 +97,11 @@ sub do_dispatch {
     &Packages::DB::init();
     my $last_modified = $Packages::DB::db_read_time;
     my $now = time;
+    my $expires = $last_modified + (12*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'))) {
@@ -175,7 +180,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]) {
@@ -351,7 +360,7 @@ sub do_dispatch {
 			     -last_modified => strftime("%a, %d %b %Y %T %z",
 							localtime($last_modified)),
 			     -expires => strftime("%a, %d %b %Y %T %z",
-						  localtime($last_modified + (12*3600))),
+						  localtime($expires)),
 			     );
 	#use Data::Dumper;
 	#print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';