- do not show packages already marked for removal as auto-installed

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 430b1bccb9f50b45bb03212f44eb20a2b5e2e627..d1d6ab7b487baef641a4c35855251127ed7bf7b3 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1444,9 +1444,13 @@ bool DoAutomaticRemove(CacheFile &Cache)
         if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
            if(Debug)
               std::cout << "We could delete %s" <<  Pkg.Name() << std::endl;
         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 && 
         if (doAutoRemove)
         {
            if(Pkg.CurrentVer() != 0 && 


@@ -1697,7 +1701,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
            // 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"),
               (Cache[Pkg].Flags & pkgCache::Flag::Auto))
            {
               ioprintf(c1out,_("%s set to manual installed.\n"),

diff --git a/debian/changelog b/debian/changelog
index bb134f7801ce67314a5ed733b70bc64b6ae34c53..37433159179bc9f3dc8841f5d4253dbe8037128b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ apt (0.6.46.4ubuntu10) feisty; urgency=low
   * cmdline/apt-get.cc:
     - "apt-get install foo" on a already installed package foo will
       clean the automatic installed flag
   * cmdline/apt-get.cc:
     - "apt-get install foo" on a already installed package foo will
       clean the automatic installed flag

+    - do not show packages already marked for removal as auto-installed

 
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 12:34:46 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100

 
 apt (0.6.46.4ubuntu9) feisty; urgency=low
 
 
 apt (0.6.46.4ubuntu9) feisty; urgency=low