be able to disable resolver with APT::Get::CallResolver and disable

auto installation with APT::Get::AutoSolving

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d71b6fba746340ae1d2f71160e3ca06693a05f56..6ffecd777cb91b98c73c74f3ce5026f945633b02 100644 (file)
--- 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)
          {

diff --git a/debian/changelog b/debian/changelog
index ed60a30472c0d155ff9216335ec8bc5d1a7721d3..e669077fed84726e8603ba63eacd450df3f4fd37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,11 +27,12 @@ apt (0.8.13.1) UNRELEASED; urgency=low
       if non is specified with APT::Architectures (Closes: #612958)
   * cmdline/apt-get.cc:
     - do not show simulation notice for non-root commands (Closes: #619072)
-    - be able to disable resolver with APT::Get::AutoSolving
+    - be able to disable resolver with APT::Get::CallResolver and disable
+      auto installation with APT::Get::AutoSolving
   * apt-pkg/deb/deblistparser.cc:
     - create foo:any provides for all architectures for an allowed package
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 28 Mar 2011 14:10:43 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 29 Mar 2011 13:12:45 +0200
 
 apt (0.8.13) unstable; urgency=low