diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-29 13:13:25 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-29 13:13:25 +0200 |
commit | 92d956ea4d68789fa6d15702a4c2336039dcdb0f (patch) | |
tree | a1adf2bcc8474b7034621b8c7f78221241f4110e /cmdline/apt-get.cc | |
parent | 71d73928ae58d6faf81e7405830881e47281f423 (diff) |
be able to disable resolver with APT::Get::CallResolver and disable
auto installation with APT::Get::AutoSolving
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r-- | cmdline/apt-get.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d71b6fba7..6ffecd777 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1798,7 +1798,7 @@ bool DoInstall(CommandLine &CmdL) BrokenFix = true; pkgProblemResolver* Fix = NULL; - if (_config->FindB("APT::Get::AutoSolving", true) == true) + if (_config->FindB("APT::Get::CallResolver", true) == true) Fix = new pkgProblemResolver(Cache); static const unsigned short MOD_REMOVE = 1; @@ -1852,7 +1852,7 @@ bool DoInstall(CommandLine &CmdL) RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction); } - if (Fix != NULL) + if (Fix != NULL && _config->FindB("APT::Get::AutoSolving", true) == true) { for (unsigned short i = 0; order[i] != 0; ++i) { |