summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-17 16:02:02 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-17 16:02:02 +0200
commite64b6489e6617ba497301a4522ba3e40edf04acb (patch)
treefd59cec2e184cb8be434d5441455ca7ea813d649 /apt-pkg
parent3f7c0d7ddf530cbc3cf2d919145405881e61d6ca (diff)
merge fix from sid to make test-compressed-indexes work again
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc6
1 files 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)