* apt-pkg/aptconfiguration.cc:

  - if the compressor is not installed, but we link against it's
    library accept it as a CompressionType (Closes: #669328)

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index d72b0c5aed2b0a6f2860aceb8c28564e1ea13447..f0cd8ebc088502ea0b33fc08fbb76205b978205d 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -47,6 +47,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        setDefaultConfigurationForCompressors();
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        setDefaultConfigurationForCompressors();

+       std::vector<APT::Configuration::Compressor> const compressors = getCompressors();

 
        // accept non-list order as override setting for config settings on commandline
        std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");
 
        // accept non-list order as override setting for config settings on commandline
        std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");


@@ -63,12 +64,12 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false)
                        continue;
                // ignore types we have no app ready to use
                if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false)
                        continue;
                // ignore types we have no app ready to use

-               std::string const appsetting = std::string("Dir::Bin::").append(*o);
-               if (_config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
+               for (; c != compressors.end(); ++c)
+                       if (c->Name == *o)
+                               break;
+               if (c == compressors.end())
+                       continue;

                types.push_back(*o);
        }
 
                types.push_back(*o);
        }
 


@@ -84,12 +85,12 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
                        continue;
                // ignore types we have no app ready to use
                if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
                        continue;
                // ignore types we have no app ready to use

-               std::string const appsetting = std::string("Dir::Bin::").append(Types->Value);
-               if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
+               for (; c != compressors.end(); ++c)
+                       if (c->Name == Types->Value)
+                               break;
+               if (c == compressors.end())
+                       continue;

                types.push_back(Types->Tag);
        }
 
                types.push_back(Types->Tag);
        }
 

diff --git a/debian/changelog b/debian/changelog
index aa88bdd93c471c9e6def83a28d421891a379b952..c65c0249c587b4d437c970e4f604c7a87dc6c5e2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,17 @@ apt (0.9.2) unstable; urgency=low
     - only treat the native apt as essential by default (Closes: #669377)
   * apt-pkg/contrib/fileutl.cc:
     - redirect stderr from compressors to /dev/null
     - only treat the native apt as essential by default (Closes: #669377)
   * apt-pkg/contrib/fileutl.cc:
     - redirect stderr from compressors to /dev/null

+  * apt-pkg/aptconfiguration.cc:
+    - if the compressor is not installed, but we link against it's
+      library accept it as a CompressionType (Closes: #669328)
+

 
   [ Malcolm Scott ]
   * apt-pkg/packagemanager.cc:
     - iterate over all pre-depends or-group member instead of looping
       endlessly over the first member in SmartUnpack (LP: #985852)
 
 
   [ Malcolm Scott ]
   * apt-pkg/packagemanager.cc:
     - iterate over all pre-depends or-group member instead of looping
       endlessly over the first member in SmartUnpack (LP: #985852)
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 19 Apr 2012 22:38:02 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 20 Apr 2012 09:52:01 +0200

 
 apt (0.9.1) unstable; urgency=low
 
 
 apt (0.9.1) unstable; urgency=low