diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2010-11-15 11:55:10 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2010-11-15 11:55:10 +0100 |
| commit | f987e6e1e5648e5a9fa66e0118b0374e9e9c0882 (patch) | |
| tree | 4b3ef31ce8883a410d80b70990df3419f7bcc12c | |
| parent | 4aeda477e7fda33523ebc6a94668085f5047d593 (diff) | |
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.
| -rw-r--r-- | apt-pkg/acquire-item.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 2c4ce91a0..fdefe9097 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",false)) + if (_config->FindB("Acquire::GzipIndexes",true)) 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",false) && compExt == "gz") + if (_config->FindB("Acquire::GzipIndexes",true) && 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",false) && compExt == "gz" && !Local) { + if (_config->FindB("Acquire::GzipIndexes",true) && compExt == "gz" && !Local) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI) + ".gz"; Rename(DestFile,FinalFile); diff --git a/debian/changelog b/debian/changelog index 71ca66100..2202a979e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ apt (0.8.8ubuntu3) UNRELEASED; urgency=low - Explicitly disable compressed indexes at the start. This ensures that we will actually test uncompressed indexes regardless of the internal default value of Acquire::GzipIndexes. + * 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. -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 12 Nov 2010 16:53:31 +0100 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index f00baacea..7d86c9789 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. False by default. + requirements when building the local package caches. True by default. </para></listitem> </varlistentry> |