Browse Source

Fix compressed index retrieval for current timestamps

Fix a thinko in r1973, which did the Acquire::GzipIndexes test ealier than the
IMS-Hit test. This led to rename errors.
tags/debian/0.8.0
martin@piware.de 11 years ago
parent
commit
bb109d0b14
1 changed files with 16 additions and 17 deletions
  1. +16
    -17
      apt-pkg/acquire-item.cc

+ 16
- 17
apt-pkg/acquire-item.cc View File

@@ -716,23 +716,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
Erase = false;
Complete = true;
string compExt = flExtension(flNotDir(URI(Desc.URI).Path));

// If we enable compressed indexes and already have gzip, keep it
if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") {
string FinalFile = _config->FindDir("Dir::State::lists");
FinalFile += URItoFileName(RealURI) + ".gz";
//if(Debug)
// std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl;
Rename(DestFile,FinalFile);
chmod(FinalFile.c_str(),0644);
// Update DestFile for .gz suffix so that the clean operation keeps it
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(RealURI) + ".gz";
return;
}

// Handle the unzipd case
string FileName = LookupTag(Message,"Alt-Filename");
if (FileName.empty() == false)
@@ -765,8 +748,24 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
else
Local = true;
string compExt = flExtension(flNotDir(URI(Desc.URI).Path));
string decompProg;

// If we enable compressed indexes and already have gzip, keep it
if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") {
string FinalFile = _config->FindDir("Dir::State::lists");
FinalFile += URItoFileName(RealURI) + ".gz";
//if(Debug)
// std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl;
Rename(DestFile,FinalFile);
chmod(FinalFile.c_str(),0644);
// Update DestFile for .gz suffix so that the clean operation keeps it
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(RealURI) + ".gz";
return;
}

// get the binary name for your used compression type
decompProg = _config->Find(string("Acquire::CompressionTypes::").append(compExt),"");
if(decompProg.empty() == false);


Loading…
Cancel
Save