Merge commit 'alioth/master'

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 9fddcb86a605d79d2d78744a11d3bd315f755346..111cabca2d4fbc4a584dc17e2bcd5d226fc7713c 100644 (file)
--- 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 e8f0679434c67c55cb41a4f4494f03c09f2e6763..d8b750c18d784604f2d37d461b16e50c543ede97 100755 (executable)
--- 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 64547ba3c0fa4469a8310ac42ff1a8c65c8213fc..3388fe3a2cf5a69f67fac699f49493106a854bd0 100644 (file)
--- 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.',