From df6c9723de23f0c2c3ccf76b7b4310019fd33366 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 3 Dec 2010 19:11:22 +0100 Subject: simplify the new-and-autoremove fix a bit --- cmdline/apt-get.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 67fc4dc25..d586d9ab0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1647,9 +1647,7 @@ bool DoAutomaticRemove(CacheFile &Cache) bool purgePkgs = _config->FindB("APT::Get::Purge", false); bool smallList = (hideAutoRemove == false && - strcasecmp(_config->Find("APT::Get::HideAutoRemove","").c_str(),"small") == 0) || - // we don't want to autoremove and we don't want to see it, so don't generate lists - (doAutoRemove == false && hideAutoRemove == true); + strcasecmp(_config->Find("APT::Get::HideAutoRemove","").c_str(),"small") == 0); string autoremovelist, autoremoveversions; unsigned long autoRemoveCount = 0; @@ -1677,7 +1675,7 @@ bool DoAutomaticRemove(CacheFile &Cache) if (Cache[Pkg].Install() == true && Pkg.CurrentVer() == 0) Cache->MarkDelete(Pkg, false); // only show stuff in the list that is not yet marked for removal - else if(Cache[Pkg].Delete() == false) + else if(hideAutoRemove == false && Cache[Pkg].Delete() == false) { ++autoRemoveCount; // we don't need to fill the strings if we don't need them -- cgit v1.2.3