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.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2c4ce91a01496bde3cd24e66982995ffd8d71d3a..fdefe90976e0ea7dbb652b01d631f093ce35d723 100644 (file)
--- 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 71ca66100d568efb0c6185d9bd8eeb3d35f012e9..2202a979e5e6f85751a67755812f84b64277efe7 100644 (file)
--- 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 f00baacea592b50cca5bc2e8edb8288cd38f401c..7d86c97898979a2d1d6cdaecbca61899993b1e32 100644 (file)
--- 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>