diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2010-11-15 12:14:03 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2010-11-15 12:14:03 +0100 |
| commit | 090afca5891429e1156c5bb6ed264168e5986415 (patch) | |
| tree | 5715d28d5b6ebcd833704e0f27c0b8c4fd2173ce | |
| parent | f987e6e1e5648e5a9fa66e0118b0374e9e9c0882 (diff) | |
apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
to preferring "gz", so that compressed indexes will actually work.
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 |