apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default

to preferring "gz", so that compressed indexes will actually work.

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 44f1f318ad049083c8d1f8c494d8fa8bb79fc9e7..0e6c3657f36f1887db34e839d55afe08ecdb130a 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -69,6 +69,10 @@ 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 2202a979e5e6f85751a67755812f84b64277efe7..bcdb037343e2d357fb22ff7433c70f8c55e024f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ apt (0.8.8ubuntu3) UNRELEASED; urgency=low
   * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
     store compressed indexes. This feature is now mature enough for general
     consumption. Update doc/apt.conf.5.xml accordingly.
+  * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
+    to preferring "gz", so that compressed indexes will actually work.
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 12 Nov 2010 16:53:31 +0100