sort uninstall correctly

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index a4ae17cb44fb7cd2759728b9d07e529e0f8ae790..ddd0b0055683fb11500d4e1d4392eb762474a738 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -92,18 +92,34 @@ namespace zypp
        {
          to_install.push_back(*it);
        }
        {
          to_install.push_back(*it);
        }

-       else if (it->status().isToBeUninstalled())
+       else if (it->status().isToBeUninstalled()
+                && !it->status().isToBeUninstalledDueToObsolete())     // leave out obsoletes

        {
          to_uninstall.push_back(*it);
        }
        {
          to_uninstall.push_back(*it);
        }

-       else if (it->status().isInstalled())
+       else if (it->status().staysInstalled())

        {
          installed.push_back(*it);
        }
       }
        {
          installed.push_back(*it);
        }
       }

-      // first uninstall what is to be uninstalled
-#warning FIXME this orderding doesn't honor the dependencies for removals
-      commit(to_uninstall);
+
+      if (to_uninstall.size() > 0 ) {
+
+       // sort delete list...
+
+       InstallOrder order(pool_r, to_uninstall, installed);
+       order.init();
+       const PoolItemList & uninstallorder(order.getTopSorted());
+
+       to_uninstall.clear();
+       for (PoolItemList::const_reverse_iterator it = uninstallorder.rbegin(); it != uninstallorder.rend(); ++it ) {
+           to_uninstall.push_back (*it);
+       }
+
+       // first uninstall what is to be uninstalled
+       commit(to_uninstall);
+      }
+

       // now install what is to be installed
       InstallOrder order(pool_r, to_install, installed);
       order.init();
       // now install what is to be installed
       InstallOrder order(pool_r, to_install, installed);
       order.init();


@@ -182,6 +198,17 @@ namespace zypp
     bool TargetImpl::providesFile (const std::string & name_str, const std::string & path_str) const
     { return _rpm.hasFile(path_str); }
 
     bool TargetImpl::providesFile (const std::string & name_str, const std::string & path_str) const
     { return _rpm.hasFile(path_str); }
 

+
+
+void
+TargetImpl::getResolvablesToInsDel ( ResPool pool_r,
+                                   PoolItemList & dellist_r,
+                                   PoolItemList & instlist_r,
+                                   PoolItemList & srclist_r )
+{
+}
+
+

     /////////////////////////////////////////////////////////////////
   } // namespace target
   ///////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////
   } // namespace target
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 847f5f5cd227499a638433bb1ad548f271baf9f5..d212e21687db446237cb0eb3e3b3d635751665c2 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -61,7 +61,13 @@ namespace zypp
       /** All resolvables in the target. */
       const ResStore & resolvables();
 
       /** All resolvables in the target. */
       const ResStore & resolvables();
 

-      /** Comomit changes in the pool */
+      /** Sort according to prereqs and media numbers */
+      void getResolvablesToInsDel ( ResPool pool_r,
+                                   PoolItemList & dellist_r,
+                                   PoolItemList & instlist_r,
+                                   PoolItemList & srclist_r );
+
+      /** Commit changes in the pool */

 #warning Add support for multiple medias - eg. limit only to CD1
       void commit(ResPool pool_r);
 
 #warning Add support for multiple medias - eg. limit only to CD1
       void commit(ResPool pool_r);