summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-04-11 11:57:48 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-04-11 11:57:48 +0200
commit8bcbc69451bfb00977c16fdb03662c844f6e861e (patch)
tree06b5eded52faf5820685dd032d7d425b35e847bf /apt-pkg
parentde97b0a56e3f454cab76aa475f40b10eed88333c (diff)
use xz-utils in the testcases instead of lzma and ensure that we really
ignore the presents (or absence) of lzma if we decided to use xz
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/aptconfiguration.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index d6691e392..d72b0c5ae 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -435,7 +435,7 @@ void Configuration::setDefaultConfigurationForCompressors() {
_config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
_config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
- _config->CndSet("Dir::Bin::lzma", _config->Find("Dir::Bin::xz"));
+ _config->Clear("Dir::Bin::lzma");
_config->Set("APT::Compressor::lzma::Binary", "xz");
if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
_config->Set("APT::Compressor::lzma::CompressArg::", "--format=lzma");