diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2010-11-25 08:50:22 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2010-11-25 08:50:22 +0100 |
| commit | 0a990e861ba7295ab0a6d369ea12ff244620b939 (patch) | |
| tree | 5041d2ff431759b6eabc95071e2e1d93a10f439a /apt-pkg | |
| parent | 5febacf17c90c3b9dd0239f62494f888e42532a7 (diff) | |
Revert r1819 and r1820 to disable compressed indexes by default again.
Testing has brought up a few places where this seriously degrades
performance, mostly in applications which iterate through all available
package records, like update-apt-xapian-index or synaptic. See
https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index fdefe9097..2c4ce91a0 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -672,7 +672,7 @@ string pkgAcqIndex::Custom600Headers() { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); - if (_config->FindB("Acquire::GzipIndexes",true)) + if (_config->FindB("Acquire::GzipIndexes",false)) Final += ".gz"; struct stat Buf; @@ -795,7 +795,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, // The files timestamp matches if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) { - if (_config->FindB("Acquire::GzipIndexes",true) && compExt == "gz") + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") // Update DestFile for .gz suffix so that the clean operation keeps it DestFile += ".gz"; return; @@ -809,7 +809,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, string decompProg; // If we enable compressed indexes and already have gzip, keep it - if (_config->FindB("Acquire::GzipIndexes",true) && compExt == "gz" && !Local) { + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI) + ".gz"; Rename(DestFile,FinalFile); diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 4b14e964a..52f54073c 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -69,10 +69,6 @@ const Configuration::getCompressionTypes(bool const &Cached) { types.push_back(*o); } - // default to preferring gzip, so that compressed indexes work - if (order.empty()) - types.push_back("gz"); - // move again over the option tree to add all missing compression types ::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes"); if (Types != 0) |