summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-03-14 13:57:57 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-03-14 13:57:57 +0100
commit7898bd970a791bb8892b0dfdffc683828a447900 (patch)
tree5325938107f0d358fff813ea65636cb91d5084ba
parentfd59a713400968e1e9f35a7eaeea08b58e77c53b (diff)
* cmdline/apt-get.cc:
- applied patch from Frode M. Døving to have APT::Get::HideAutoRemove
-rw-r--r--cmdline/apt-get.cc7
-rw-r--r--doc/examples/configure-index1
2 files changed, 5 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ed1ef98be..e8e5a8c39 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1394,8 +1394,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
{
bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false);
+ bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove");
pkgDepCache::ActionGroup group(*Cache);
-
if(Debug)
std::cout << "DoAutomaticRemove()" << std::endl;
@@ -1434,8 +1434,9 @@ bool DoAutomaticRemove(CacheFile &Cache)
}
}
}
- ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
- if (!doAutoRemove && autoremovelist.size() > 0)
+ if (!hideAutoRemove)
+ ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
+ if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0)
c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
// Now see if we destroyed anything
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 32b7168a0..d3e061f9a 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -33,6 +33,7 @@ APT
{
Arch-Only "false";
AutomaticRemove "false";
+ HideAutoRemove "false";
Download-Only "false";
Simulate "false";
Assume-Yes "false";