From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Sep 2006 09:32:32 +0000 (+0200)
Subject: * cmdline/apt-get.cc:
X-Git-Tag: 0.7.24ubuntu1~231^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c97fd4ec4a34eb15eb8985890a47e768f4b94f0d?ds=inline

* cmdline/apt-get.cc:
  - only error out if both "APT::Get::Autoremove" is set to true and "APT::Get::Remove" to false, in this case the the save options wins and apt will abort
---

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5e1ccb0c0..411b16e90 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1398,7 +1398,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
    if(Debug)
       std::cout << "DoAutomaticRemove()" << std::endl;
 
-   if (_config->FindB("APT::Get::Remove",true) == false)
+   if (_config->FindB("APT::Get::AutomaticRemove") &&
+       _config->FindB("APT::Get::Remove",true) == false)
       return _error->Error(_("We are not supposed to delete stuff, can't "
 			     "start AutoRemover"));