summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-config.cc16
-rw-r--r--debian/changelog11
2 files changed, 23 insertions, 4 deletions
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 94f6ee9b0..47bedfe3f 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -134,6 +134,22 @@ int main(int argc,const char *argv[]) /*{{{*/
for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
_config->Set("APT::Architectures::", *a);
+ std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+ _config->Clear("APT::Compressor");
+ string conf = "APT::Compressor::";
+ for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c)
+ {
+ string comp = conf + c->Name + "::";
+ _config->Set(comp + "Name", c->Name);
+ _config->Set(comp + "Extension", c->Extension);
+ _config->Set(comp + "Binary", c->Binary);
+ _config->Set(std::string(comp + "Cost").c_str(), c->Cost);
+ for (std::vector<std::string>::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a)
+ _config->Set(comp + "CompressArg::", *a);
+ for (std::vector<std::string>::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a)
+ _config->Set(comp + "UncompressArg::", *a);
+ }
+
// Match the operation
CmdL.DispatchArg(Cmds);
diff --git a/debian/changelog b/debian/changelog
index f95edd60c..685774a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,17 @@
+
apt (0.8.16~exp9) UNRELEASED; urgency=low
[ Julian Andres Klode ]
* apt-pkg/cdrom.cc:
- Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
-
+
[ Michael Vogt ]
* apt-pkg/cdrom.cc:
- use aptconfiguration to get the supported compression types
* debian/control:
- bump debhelper build-dep to debhelper (>= 8.1.3~)
- set libapt-pkg-dev to multi-arch: same too
-
+
[ Colin Watson ]
* Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
@@ -27,8 +28,10 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low
* cmdline/apt-get.cc:
- ignore foreign architectures if we check if a provides has only one
resolver as it's basically the same for the user, so no need to choose
-
- -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100
+ * cmdline/apt-config.cc:
+ - dump the APT::Compressor settings correctly and completely
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Dec 2011 17:34:50 +0100
apt (0.8.16~exp8) experimental; urgency=low