diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 11:11:21 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 11:11:21 +0200 |
commit | 03d6479dd7ccf7c7273289adaf16964743ed2a1f (patch) | |
tree | c0746aa6968e994ab25b7e5b323bcca670d0f6c8 | |
parent | 518763f630873e35398d2537ebfabf97b5aea489 (diff) | |
parent | 79b207bc0a3a7d9cef91f96e6061ea35451c563a (diff) |
merged from bzr+ssh://bazaar.launchpad.net/~donkult/apt/sid/
-rw-r--r-- | apt-pkg/aptconfiguration.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index f0cd8ebc0..e1225b3e6 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -61,12 +61,14 @@ const Configuration::getCompressionTypes(bool const &Cached) { if ((*o).empty() == true) continue; // ignore types we have no method ready to use - if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false) + std::string const method = std::string("Acquire::CompressionTypes::").append(*o); + if (_config->Exists(method) == false) continue; // ignore types we have no app ready to use + std::string const app = _config->Find(method); std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); for (; c != compressors.end(); ++c) - if (c->Name == *o) + if (c->Name == app) break; if (c == compressors.end()) continue; |