* Swedish translation update. Closes: #592366

[apt.git] / apt-pkg / indexrecords.cc

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index cdc2897bff4cfcda50b63c7ac75027d62743709a..eb9a368662e9f8b192a8513ce9db6fdc6ef1c2fd 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -39,6 +39,11 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
    return Entries[MetaKey];
 }
 
    return Entries[MetaKey];
 }
 

+bool indexRecords::Exists(string const &MetaKey) const
+{
+   return Entries.count(MetaKey) == 1;
+}
+

 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
    FileFd Fd(Filename, FileFd::ReadOnly);
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
    FileFd Fd(Filename, FileFd::ReadOnly);


@@ -104,9 +109,9 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
       }
    }
    // get the user settings for this archive and use what expires earlier
       }
    }
    // get the user settings for this archive and use what expires earlier

-   int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0);
+   int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);

    if (Label.empty() == true)
    if (Label.empty() == true)

-      MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge);
+      MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);

 
    if(MaxAge == 0) // No user settings, use the one from the Release file
       return true;
 
    if(MaxAge == 0) // No user settings, use the one from the Release file
       return true;