summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-11-25 15:58:53 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-11-25 15:58:53 +0100
commit6ff4a64c8588a721cb1dfb8303864a6e20ccd76e (patch)
tree175c2de3783dfaf8d44b8322009f23fde640aead
parent08ded4d6a04d28c61a53fe550133b146752badfe (diff)
parentd88a49c830c2ea7e942125be37703bc411277ac1 (diff)
merged lp:~pitti/apt/compressed-indexes
-rw-r--r--debian/changelog7
-rwxr-xr-xtest/integration/test-compressed-indexes1
-rwxr-xr-xtest/test-indexes.sh1
3 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 545476459..98c127143 100644
--- a/debian/changelog
+++ b/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
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 97a1453f7..be33edbb7 100755
--- a/test/integration/test-compressed-indexes
+++ b/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
diff --git a/test/test-indexes.sh b/test/test-indexes.sh
index 17363718d..50d54f691 100755
--- a/test/test-indexes.sh
+++ b/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