From e64b6489e6617ba497301a4522ba3e40edf04acb Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 17 Sep 2014 16:02:02 +0200
Subject: merge fix from sid to make test-compressed-indexes work again

---
 apt-pkg/acquire-item.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a48be70c2..f323b48bf 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1029,10 +1029,8 @@ string pkgAcqIndexTrans::Custom600Headers()
 {
    string Final = _config->FindDir("Dir::State::lists");
    Final += URItoFileName(RealURI);
-
-   std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
-   if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
-      DestFile += ".gz";
+   if (_config->FindB("Acquire::GzipIndexes",false))
+       Final += ".gz";
 
    struct stat Buf;
    if (stat(Final.c_str(),&Buf) != 0)
-- 
cgit v1.2.3