summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/aptconfiguration.cc4
-rw-r--r--debian/changelog2
2 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 44f1f318a..0e6c3657f 100644
--- 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 2202a979e..bcdb03734 100644
--- 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