* cmdline/apt-get.cc:

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8f4e17898dbcaed84153d5835cb848ba6690b99f..ed1ef98be048791a4a084fcfc0cd52792886ba8c 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1417,9 +1417,13 @@ bool DoAutomaticRemove(CacheFile &Cache)
         if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
            if(Debug)
               std::cout << "We could delete %s" <<  Pkg.Name() << std::endl;
-          
-        autoremovelist += string(Pkg.Name()) + " ";
-        autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
+         
+        // only show stuff in the list that is not yet marked for removal
+        if(Cache[Pkg].Delete() == false) 
+        {
+           autoremovelist += string(Pkg.Name()) + " ";
+           autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
+        }
         if (doAutoRemove)
         {
            if(Pkg.CurrentVer() != 0 && 
@@ -1611,7 +1615,8 @@ bool DoInstall(CommandLine &CmdL)
            // see if we need to fix the auto-mark flag 
            // e.g. apt-get install foo 
            // where foo is marked automatic
-           if(Cache[Pkg].Install() == false && 
+           if(!Remove && 
+              Cache[Pkg].Install() == false && 
               (Cache[Pkg].Flags & pkgCache::Flag::Auto))
            {
               ioprintf(c1out,_("%s set to manual installed.\n"),