From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 19 Aug 2008 21:56:13 +0000 (+0200)
Subject: Merge commit 'alioth/master'
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=cd80f50e4bba8ac28df7b3185ae94ce12520e2f2;hp=1cec3c5e83430f3d9721336df1ab8f67b1832ef2

Merge commit 'alioth/master'
---

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 9fddcb8..111cabc 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -30,7 +30,7 @@ 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
-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 --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e8f0679..d8b750c 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -94,9 +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);
+    $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'))) {
@@ -351,7 +353,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>';
diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 64547ba..3388fe3 100644
--- a/templates/html/search_contents.tmpl
+++ b/templates/html/search_contents.tmpl
@@ -73,9 +73,9 @@
    arch_wording = ( architectures_enc == 'any' ? g("all architectures") : g("architecture(s) <em>%s</em>", architectures_enc) );
    wording = g("paths that end with");
    IF mode == 'filename';
-	wording = g("files named");
-   ELSIF mode == 'exactfilename';
 	wording = g("filenames that contain");
+   ELSIF mode == 'exactfilename';
+	wording = g("files named");
    END %]
 [%# @translators: I'm really sorry :/ %]
 <p>[% g('You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s.',