merged from apt--mvo

[apt.git] / apt-pkg / depcache.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index b8c996c58d21d35b59dc95bf952ef43c7ebdd924..87443f9f3cea83c76c53cbf84d208f95f9e5bea3 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -715,9 +715,18 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
    // We dont even try to keep virtual packages..
    if (Pkg->VersionList == 0)
       return;
    // We dont even try to keep virtual packages..
    if (Pkg->VersionList == 0)
       return;

-   
+
+#if 0 // reseting the autoflag here means we lose the 
+      // auto-mark information if a user selects a package for removal
+      // but changes  his mind then and sets it for keep again
+      // - this makes sense as default when all Garbage dependencies
+      //   are automatically marked for removal (as aptitude does).
+      //   setting a package for keep then makes it no longer autoinstalled
+      //   for all other use-case this action is rather suprising

    if(FromUser && !P.Marked)
      P.Flags &= ~Flag::Auto;
    if(FromUser && !P.Marked)
      P.Flags &= ~Flag::Auto;

+#endif
+

    RemoveSizes(Pkg);
    RemoveStates(Pkg);
 
    RemoveSizes(Pkg);
    RemoveStates(Pkg);
 


@@ -1316,8 +1325,7 @@ bool pkgDepCache::Sweep()
      StateCache &state=PkgState[p->ID];
 
      // if it is not marked and it is installed, it's garbage 
      StateCache &state=PkgState[p->ID];
 
      // if it is not marked and it is installed, it's garbage 

-     if(!state.Marked && (!p.CurrentVer().end() || state.Install()) &&
-       !state.Delete())
+     if(!state.Marked && (!p.CurrentVer().end() || state.Install()))

      {
        state.Garbage=true;
        if(_config->FindB("Debug::pkgAutoRemove",false))
      {
        state.Garbage=true;
        if(_config->FindB("Debug::pkgAutoRemove",false))