apt-key: change to / before find to satisfy its CWD needs

[apt.git] / apt-pkg / aptconfiguration.cc

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index d37ac2537fb904e45095b3fcc2773363b265d865..32778e273039bff82a08d3f2df96fa3d555d5bee 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -35,8 +35,10 @@ namespace APT {
 // setDefaultConfigurationForCompressors                               /*{{{*/
 static void setDefaultConfigurationForCompressors() {
        // Set default application paths to check for optional compression types
+       _config->CndSet("Dir::Bin::gzip", "/bin/gzip");
        _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
        _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
+       _config->CndSet("Dir::Bin::lz4", "/usr/bin/lz4");
        if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
                _config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz"));
                _config->Set("APT::Compressor::lzma::Binary", "xz");
@@ -59,6 +61,12 @@ static void setDefaultConfigurationForCompressors() {
                        _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
                }
        }
+       // setup the defaults for the compressiontypes => method mapping
+       _config->CndSet("Acquire::CompressionTypes::xz","xz");
+       _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
+       _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
+       _config->CndSet("Acquire::CompressionTypes::gz","gzip");
+       _config->CndSet("Acquire::CompressionTypes::lz4","lz4");
 }
                                                                        /*}}}*/
 // getCompressionTypes - Return Vector of usable compressiontypes      /*{{{*/
@@ -74,13 +82,6 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                        types.clear();
        }
 
-       // setup the defaults for the compressiontypes => method mapping
-       _config->CndSet("Acquire::CompressionTypes::xz","xz");
-       _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
-       _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
-       _config->CndSet("Acquire::CompressionTypes::gz","gzip");
-
-       setDefaultConfigurationForCompressors();
        std::vector<APT::Configuration::Compressor> const compressors = getCompressors();
 
        // load the order setting into our vector
@@ -364,38 +365,44 @@ const Configuration::getCompressors(bool const Cached) {
 
        setDefaultConfigurationForCompressors();
 
-       compressors.push_back(Compressor(".", "", "", NULL, NULL, 1));
+       compressors.push_back(Compressor(".", "", "", NULL, NULL, 0));
+       if (_config->Exists("Dir::Bin::lz4") == false || FileExists(_config->FindFile("Dir::Bin::lz4")) == true)
+               compressors.push_back(Compressor("lz4",".lz4","lz4","-1","-d",50));
+#ifdef HAVE_LZ4
+       else
+               compressors.push_back(Compressor("lz4",".lz4","false", NULL, NULL, 50));
+#endif
        if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
-               compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",2));
+               compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",100));
 #ifdef HAVE_ZLIB
        else
-               compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2));
+               compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 100));
 #endif
        if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
-               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",3));
+               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",200));
 #ifdef HAVE_LZMA
        else
-               compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 3));
+               compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 200));
 #endif
        if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
-               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",4));
+               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",300));
 #ifdef HAVE_BZ2
        else
-               compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 4));
+               compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 300));
 #endif
        if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-               compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",5));
+               compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",400));
 #ifdef HAVE_LZMA
        else
-               compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 5));
+               compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 400));
 #endif
 
-       std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
-       for (std::vector<std::string>::const_iterator c = comp.begin();
-            c != comp.end(); ++c) {
-               if (c->empty() || *c == "." || *c == "gzip" || *c == "bzip2" || *c == "lzma" || *c == "xz")
+       std::vector<std::string> const comp = _config->FindVector("APT::Compressor", "", true);
+       for (auto const &c: comp)
+       {
+               if (c.empty() || std::any_of(compressors.begin(), compressors.end(), [&c](Compressor const &ac) { return ac.Name == c; }))
                        continue;
-               compressors.push_back(Compressor(c->c_str(), std::string(".").append(*c).c_str(), c->c_str(), "-9", "-d", 100));
+               compressors.push_back(Compressor(c.c_str(), std::string(".").append(c).c_str(), c.c_str(), nullptr, nullptr, 1000));
        }
 
        return compressors;