enhance the Valid-Until code a bit by using the correct RFC1123StrToTime

[apt.git] / apt-pkg / acquire-item.cc

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 4a846804e53231be89a4ef8e16de90010de91c12..ac84c2e5e595db08a817b20703a5f8bb104a8d6e 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1178,13 +1178,15 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message)                      /*{{{*/
       Transformed = "";
    }
 
-   if (_config->FindB("Acquire::Check-Valid-Until", true)) {
-      if (MetaIndexParser->GetValidUntil() > 0 &&
-          time(NULL) > MetaIndexParser->GetValidUntil()) {
-        return _error->Error(_("Release file expired, ignoring %s (valid until %s)"),
-                             RealURI.c_str(), 
-                             TimeRFC1123(MetaIndexParser->GetValidUntil()).c_str());
-      }
+   if (_config->FindB("Acquire::Check-Valid-Until", true) == true &&
+       MetaIndexParser->GetValidUntil() > 0) {
+      time_t const invalid_since = time(NULL) - MetaIndexParser->GetValidUntil();
+      if (invalid_since > 0)
+        // TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+        // the time since then the file is invalid - formated in the same way as in
+        // the download progress display (e.g. 7d 3h 42min 1s)
+        return _error->Error(_("Release file expired, ignoring %s (invalid since %s)"),
+                             RealURI.c_str(), TimeToStr(invalid_since).c_str());
    }
 
    if (_config->FindB("Debug::pkgAcquire::Auth", false))