diff options
| author | Jay Freeman (saurik) <saurik@saurik.com> | 2016-12-23 01:29:49 -0800 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2020-07-17 00:22:23 -1000 |
| commit | 119a9d038639eb8c37b67f52e21f85674e46aecd (patch) | |
| tree | c7bca3f2db035b6a6c741da0d54439799c3bffd2 /apt-pkg | |
| parent | 0cc32d91174feee7f7cf029784598d24a42c1574 (diff) | |
Only check for valid Date if checking Valid-Until.
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index f88076abf..26331291c 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -532,10 +532,7 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro std::string const StrDate = Section.FindS("Date"); if (RFC1123StrToTime(StrDate.c_str(), Date) == false) - { - _error->Warning( _("Invalid '%s' entry in Release file %s"), "Date", Filename.c_str()); Date = 0; - } bool CheckDate = _config->FindB("Acquire::Check-Date", true); if (d->CheckDate == metaIndex::TRI_NO) @@ -565,6 +562,9 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro if (CheckValidUntil == true) { + if (Date == 0) + _error->Warning( _("Invalid '%s' entry in Release file %s"), "Date", Filename.c_str()); + std::string const StrValidUntil = Section.FindS("Valid-Until"); // if we have a Valid-Until header in the Release file, use it as default |