merged lp:~pitti/apt/compressed-indexes

debian/changelog

@@ -1,9 +1,16 @@
 apt (0.8.10) unstable; urgency=low
 
+  [ Michael Vogt ]
   * methods/http.cc:
     - do not hang if Acquire::http::ProxyAutoDetect can not be
       executed or returns no data (LP: #654393)
 
+  [ Martin Pitt ]
+  * test/integration/test-compressed-indexes, test/test-indexes.sh:
+    - 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.
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:40:45 +0100
 
 apt (0.8.9) unstable; urgency=low

test/integration/test-compressed-indexes

@@ -69,6 +69,7 @@ testrun() {
 	rm -rf testpkg-1.0
 }
 
+echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex
 msgmsg "File: Test with uncompressed indexes"
 testrun
 

test/test-indexes.sh

@@ -144,6 +144,7 @@ echo '--- apt-cache show works without indexes'
 ! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'
 
 echo "===== uncompressed indexes ====="
+echo 'Acquire::GzipIndexes "false";' > etc/apt/apt.conf.d/02compress-indexes
 check_update
 check_indexes
 check_cache