diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index ed68244c6..69f6f6f8d 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -74,8 +74,8 @@ const Configuration::getCompressionTypes(bool const &Cached) { } // setup the defaults for the compressiontypes => method mapping - _config->CndSet("Acquire::CompressionTypes::bz2","bzip2"); _config->CndSet("Acquire::CompressionTypes::xz","xz"); + _config->CndSet("Acquire::CompressionTypes::bz2","bzip2"); _config->CndSet("Acquire::CompressionTypes::lzma","lzma"); _config->CndSet("Acquire::CompressionTypes::gz","gzip"); @@ -449,17 +449,17 @@ const Configuration::getCompressors(bool const Cached) { else compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2)); #endif - if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true) - compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3)); -#ifdef HAVE_BZ2 - else - compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 3)); -#endif if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true) - compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4)); + compressors.push_back(Compressor("xz",".xz","xz","-6","-d",3)); #ifdef HAVE_LZMA else - compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 4)); + compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 3)); +#endif + if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true) + compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",4)); +#ifdef HAVE_BZ2 + else + compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 4)); #endif if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true) compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5)); |