From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 9 May 2012 19:44:11 +0000 (+0200)
Subject: * apt-pkg/aptconfiguration.cc:
X-Git-Tag: 0.9.3~1^2~10
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e29d7e3e1c7bcff54123b9a69f9b0136d4cf1de5

* apt-pkg/aptconfiguration.cc:
  - use NULL instead of "" for no (un)compress parameters
---

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index e1225b3e6..0fd470ed5 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -477,18 +477,18 @@ const Configuration::getCompressors(bool const Cached) {
 
 	setDefaultConfigurationForCompressors();
 
-	compressors.push_back(Compressor(".", "", "", "", "", 1));
+	compressors.push_back(Compressor(".", "", "", NULL, NULL, 1));
 	if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
 		compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2));
 #ifdef HAVE_ZLIB
 	else
-		compressors.push_back(Compressor("gzip",".gz","false", "", "", 2));
+		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", "", "", 3));
+		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));
diff --git a/debian/changelog b/debian/changelog
index 022eac529..b0c74ea31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ apt (0.9.3) UNRELEASED; urgency=low
       for the report. (Closes: #671721)
   * apt-pkg/contrib/fileutl.cc:
     - check that the fd which are closed are valid
+  * apt-pkg/aptconfiguration.cc:
+    - use NULL instead of "" for no (un)compress parameters
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 07 May 2012 21:12:23 +0200