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

4 files changed, 12 insertions, 8 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)
diff --git a/debian/changelog b/debian/changelog
index d37cc6012..8f60b2bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 apt (0.8.9ubuntu4) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * cmdline/apt-key:
     - set timeout of wget for net-update to 90 seconds (thanks to \sh)
 
+  [ Martin Pitt ]
+  * 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
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 18:15:09 +0100
 
 apt (0.8.9ubuntu3) natty; urgency=low
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 7d86c9789..f00baacea 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -455,7 +455,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 When downloading <literal>gzip</literal> compressed indexes (Packages, Sources, or
 	 Translations), keep them gzip compressed locally instead of unpacking
 	 them. This saves quite a lot of disk space at the expense of more CPU
-	 requirements when building the local package caches. True by default.
+	 requirements when building the local package caches. False by default.
 	 </para></listitem>
      </varlistentry>