added preliminary commit function for target

diff --git a/zypp/Target.cc b/zypp/Target.cc
index abdc614be2ecc753deed6423975394c3442e62a2..c0f6e51a053757e5c2f485ff8a6c61ef514c5ecb 100644 (file)
--- a/zypp/Target.cc
+++ b/zypp/Target.cc
@@ -70,6 +70,9 @@ namespace zypp
   target::rpm::RpmDb & Target::rpmDb()
   { return _pimpl->rpm(); }
 
   target::rpm::RpmDb & Target::rpmDb()
   { return _pimpl->rpm(); }
 

+  void Target::commit(ResPool & pool_r)
+  { return _pimpl->commit(pool_r); }
+

   std::ostream & Target::dumpOn( std::ostream & str ) const
   { return _pimpl->dumpOn( str ); }
 
   std::ostream & Target::dumpOn( std::ostream & str ) const
   { return _pimpl->dumpOn( str ); }
 

diff --git a/zypp/Target.h b/zypp/Target.h
index 38aff03a20dc9800a353f7f51045794de458092b..45d668671b648d2e5592cd0fe632c4066bb24ad7 100644 (file)
--- a/zypp/Target.h
+++ b/zypp/Target.h
@@ -18,7 +18,7 @@
 
 #include "zypp/ResStore.h"
 #include "zypp/Pathname.h"
 
 #include "zypp/ResStore.h"
 #include "zypp/Pathname.h"

-#include "zypp/target/TargetImpl.h"
+#include "zypp/ResPool.h"

 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp


@@ -53,11 +53,13 @@ namespace zypp
     static Target_Ptr nullimpl();
     /** Refference to the RPM database */
     target::rpm::RpmDb & rpmDb();
     static Target_Ptr nullimpl();
     /** Refference to the RPM database */
     target::rpm::RpmDb & rpmDb();

+    /** Comomit changes in the pool */
+    void commit(ResPool & pool_r);

 
   public:
 
   public:

-    /** Factory ctor */
+    /** Ctor */

     Target( const Pathname & root = "/" );
     Target( const Pathname & root = "/" );

-    /** Factory ctor */
+    /** Ctor */

     explicit
     Target( const Impl_Ptr & impl_r );
 
     explicit
     Target( const Impl_Ptr & impl_r );
 

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 279dadd4781bc9cc88f073b54e5176dfaf990902..2b4be7de354143681f4b4fc863daa47aa3591629 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -14,7 +14,9 @@
 
 #include "zypp/target/TargetImpl.h"
 
 
 #include "zypp/target/TargetImpl.h"
 

-using std::endl;
+#include <vector>
+
+using namespace std;

 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp


@@ -74,6 +76,48 @@ namespace zypp
       return _store;
     }
 
       return _store;
     }
 

+    void TargetImpl::commit(ResPool & pool_r)
+    {
+#warning FIXME this orderding doesn't honor the dependencies
+      vector<ResObject::constPtr> to_uninstall;
+      vector<ResObject::constPtr> to_install;
+      for (ResPool::const_iterator it = pool_r.begin();
+           it != pool_r.end(); it++)
+      {
+       if (it->status().isToBeInstalled())
+       {
+         to_install.push_back(it->resolvable());
+       }
+       else if (it->status().isToBeUninstalled())
+       {
+         to_uninstall.push_back(it->resolvable());
+       }
+      }
+      // first uninstall what is to be uninstalled
+      for (vector<ResObject::constPtr>::const_iterator it = to_uninstall.begin();
+           it != to_uninstall.end();
+          it++)
+      {
+       if (isKind<Package>(*it))
+       {
+         Package::constPtr p = dynamic_pointer_cast<const Package>(*it);
+         rpm().removePackage(p);
+       }
+#warning FIXME other resolvables (once more below)
+      }
+      // now install what is to be installed
+      for (vector<ResObject::constPtr>::const_iterator it = to_install.begin();
+           it != to_install.end();
+          it++)
+      {
+       if (isKind<Package>(*it))
+       {
+         Package::constPtr p = dynamic_pointer_cast<const Package>(*it);
+         rpm().installPackage(p->getPlainRpm(), rpm::RpmDb::RPMINST_NOUPGRADE);
+       }
+      }
+    }
+

     rpm::RpmDb & TargetImpl::rpm()
     { return _rpm; }
 
     rpm::RpmDb & TargetImpl::rpm()
     { return _rpm; }
 

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index ee63bbb904985f111fc4606cd4aa2d70799c0ab3..3167ce80c0bb42973e91704a800dd40d537d1cfa 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -60,6 +60,10 @@ namespace zypp
       /** All resolvables in the target. */
       const ResStore & resolvables();
 
       /** All resolvables in the target. */
       const ResStore & resolvables();
 

+      /** Comomit changes in the pool */
+#warning Add support for multiple medias - eg. limit only to CD1
+      void commit(ResPool & pool_r);
+

       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const
       { return str << "TargetImpl"; }
       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const
       { return str << "TargetImpl"; }