diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-28 10:56:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-28 10:56:46 +0200 |
| commit | aa833344f36bb81fb79c9d1dbe8f9240a00fc645 (patch) | |
| tree | d3c6f7c35aeb31047c36e80d37f37cad70260ebd | |
| parent | a5ca55e452d48bb59b4a5151816042ed722c4983 (diff) | |
* cmdline/apt-config.cc:
- show Acquire::Languages and APT::Architectures settings
in 'dump' (Closes: 626739)
| -rw-r--r-- | cmdline/apt-config.cc | 13 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 9919a9c94..589ee7ada 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -20,6 +20,8 @@ #include <apt-pkg/error.h> #include <apt-pkg/init.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/aptconfiguration.h> #include <config.h> #include <apti18n.h> @@ -27,6 +29,7 @@ #include <locale.h> #include <iostream> #include <string> +#include <vector> /*}}}*/ using namespace std; @@ -119,6 +122,16 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.FileSize() == 0) return ShowHelp(); + std::vector<std::string> const langs = APT::Configuration::getLanguages(true); + _config->Clear("Acquire::Languages"); + for (std::vector<std::string>::const_iterator l = langs.begin(); l != langs.end(); ++l) + _config->Set("Acquire::Languages::", *l); + + std::vector<std::string> const archs = APT::Configuration::getArchitectures(); + _config->Clear("APT::Architectures"); + for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a) + _config->Set("APT::Architectures::", *a); + // Match the operation CmdL.DispatchArg(Cmds); diff --git a/debian/changelog b/debian/changelog index a416af19e..971cf53b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,8 +74,11 @@ apt (0.8.14.2) UNRELEASED; urgency=low lock step even in immediate configuration (Closes: #618288) * apt-pkg/init.cc: - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer! + * cmdline/apt-config.cc: + - show Acquire::Languages and APT::Architectures settings + in 'dump' (Closes: 626739) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 28 May 2011 10:52:08 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 28 May 2011 10:54:23 +0200 apt (0.8.14.1) unstable; urgency=low |