Browse Source

use the Valid-Until header from the Release file but if the user

provides a setting in the configuration prefer the date which is
earlier.
debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
bbde96a611
  1. 33
      apt-pkg/indexrecords.cc

33
apt-pkg/indexrecords.cc

@ -88,34 +88,39 @@ bool indexRecords::Load(const string Filename) /*{{{*/
{
strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
return false;
}
}
string Label = Section.FindS("Label");
string StrDate = Section.FindS("Date");
string StrValidUntil = Section.FindS("Valid-Until");
// if we have a Valid-Until header, use it
// if we have a Valid-Until header in the Release file, use it as default
if (StrValidUntil.empty() == false)
{
// set ValidUntil based on the information in the Release file
if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false)
{
strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str());
return false;
}
} else {
// if we don't have a valid-until string, check if we have a default
int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0);
if (Label.empty() == true)
MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::"+Label).c_str(), MaxAge);
}
// get the user settings for this archive and use what expires earlier
int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0);
if (Label.empty() == true)
MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge);
if(MaxAge > 0 && RFC1123StrToTime(StrDate.c_str(), ValidUntil) == false)
{
strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
return false;
}
ValidUntil += 24*60*60*MaxAge;
if(MaxAge == 0) // No user settings, use the one from the Release file
return true;
time_t date;
if (RFC1123StrToTime(StrDate.c_str(), date) == false)
{
strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
return false;
}
date += 24*60*60*MaxAge;
if (ValidUntil == 0 || ValidUntil > date)
ValidUntil = date;
return true;
}

Loading…
Cancel
Save