when installing a xml-store resolvable (all except package,

message, script), delete older versions (#160792).

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 4ac1e98..6ab2344 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Apr 21 12:17:27 CEST 2006 - mvidner@suse.cz
+
+- when installing a xml-store resolvable (all except package,
+  message, script), delete older versions (#160792).
+- rev 3164
+
+-------------------------------------------------------------------
 Thu Apr 20 14:10:41 CEST 2006 - kkaempf@suse.de
 
 - properly clear transaction flag after successful commit

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index a2d1d9c..73c9961 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -29,9 +29,11 @@
 #include "zypp/target/TargetImpl.h"
 #include "zypp/target/TargetCallbackReceiver.h"
 
+#include "zypp/solver/detail/Helper.h"
 #include "zypp/solver/detail/InstallOrder.h"
 
 using namespace std;
+using zypp::solver::detail::Helper;
 using zypp::solver::detail::InstallOrder;
 
 ///////////////////////////////////////////////////////////////////
@@ -155,11 +157,11 @@ namespace zypp
         MIL << "Restrict to media number " << policy_r.restrictToMedia() << endl;
       }
 
-      commit (to_uninstall, policy_r );
+      commit (to_uninstall, policy_r, pool_r );
 
       if (policy_r.restrictToMedia() == 0) {                   // commit all
-        result._remaining = commit( to_install, policy_r );
-        result._srcremaining = commit( to_srcinstall, policy_r );
+        result._remaining = commit( to_install, policy_r, pool_r );
+        result._srcremaining = commit( to_srcinstall, policy_r, pool_r );
       }
       else
       {
@@ -180,7 +182,7 @@ namespace zypp
             current_install.push_back( *it );
           }
         }
-        TargetImpl::PoolItemList bad = commit( current_install, policy_r );
+        TargetImpl::PoolItemList bad = commit( current_install, policy_r, pool_r );
         result._remaining.insert(result._remaining.end(), bad.begin(), bad.end());
 
         for (TargetImpl::PoolItemList::iterator it = to_srcinstall.begin(); it != to_srcinstall.end(); ++it)
@@ -196,7 +198,7 @@ namespace zypp
             current_srcinstall.push_back( *it );
           }
         }
-        bad = commit( current_srcinstall, policy_r );
+        bad = commit( current_srcinstall, policy_r, pool_r );
         result._srcremaining.insert(result._srcremaining.end(), bad.begin(), bad.end());
       }
 
@@ -208,7 +210,8 @@ namespace zypp
 
     TargetImpl::PoolItemList
     TargetImpl::commit( const TargetImpl::PoolItemList & items_r,
-                        const ZYppCommitPolicy & policy_r )
+                        const ZYppCommitPolicy & policy_r,
+                       const ResPool & pool_r )
     {
       TargetImpl::PoolItemList remaining;
 
@@ -382,6 +385,14 @@ namespace zypp
                }
                 else
                 {
+                 // #160792 do not just add, also remove older versions
+                 if (true) // !installOnly - only on Package?!
+                 {
+                   for (PoolItem_Ref old = Helper::findInstalledItem (pool_r, *it); old; )
+                   {
+                     _storage.deleteObject(old.resolvable());
+                   }
+                 }
                   _storage.storeObject(it->resolvable());
                 }
                 success = true;

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 518c262..0a7461e 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -108,8 +108,10 @@ namespace zypp
       void enableStorage(const Pathname &root_r);
 
       /** Commit ordered changes
-         return uncommitted ones (due to error) */
-      PoolItemList commit( const PoolItemList & items_r, const ZYppCommitPolicy & policy_r );
+       *  @param pool_r only needed for #160792
+       *  @return uncommitted ones (due to error)
+       */
+      PoolItemList commit( const PoolItemList & items_r, const ZYppCommitPolicy & policy_r, const ResPool & pool_r );
 
       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const