- remove old sat transaction argument in Transaction constructor. Cleanup code.

diff --git a/zypp/sat/Transaction.cc b/zypp/sat/Transaction.cc
index ca8e5ad..a153f12 100644 (file)
--- a/zypp/sat/Transaction.cc
+++ b/zypp/sat/Transaction.cc
@@ -11,6 +11,7 @@
 extern "C"
 {
 #include <solv/transaction.h>
+#include <solv/solver.h>
 #include <solv/bitmap.h>
 }
 #include <iostream>
@@ -69,11 +70,7 @@ namespace zypp
        typedef std::tr1::unordered_map<detail::IdType,PostMortem> pmmap_type;
 
       public:
-       Impl()
-         : _trans( ::transaction_create( nullptr ) )
-       { memset( _trans, 0, sizeof(_trans) ); }
-
-       Impl( ::_Transaction & trans_r )
+       Impl( )
          : _watcher( myPool().serial() )
          , _trans( nullptr )
        {
@@ -85,9 +82,18 @@ namespace zypp
            sat::Solvable solv( (*it).satSolvable() );
            decisionq.push( solv.isSystem() ? -solv.id() : solv.id() );
          }
-         if ( trans_r.noobsmap.size )
-           ::map_grow( &trans_r.noobsmap, myPool()->nsolvables );
-         _trans = ::transaction_create_decisionq( myPool().getPool(), decisionq, &trans_r.noobsmap );
+         Queue noobsq;
+         for_( it, sat::Pool::instance().multiversionBegin(), sat::Pool::instance().multiversionEnd() )
+         {
+           noobsq.push( SOLVER_NOOBSOLETES | SOLVABLE_NAME );
+           noobsq.push( it->id() );
+         }
+         Map noobsmap;
+         ::map_init( &noobsmap, 0 );
+         ::solver_calculate_noobsmap( myPool().getPool(), noobsq, &noobsmap );
+
+         _trans = ::transaction_create_decisionq( myPool().getPool(), decisionq, &noobsmap );
+         ::map_free( &noobsmap );
 
          // NOTE: package/product buddies share the same ResStatus
          // so we also link the buddies stepStages. This assumes
@@ -292,11 +298,7 @@ namespace zypp
     ///////////////////////////////////////////////////////////////////
 
     Transaction::Transaction()
-      : _pimpl( Impl::nullimpl() )
-    {}
-
-    Transaction::Transaction( ::_Transaction & trans_r )
-      : _pimpl( new Impl( trans_r ) )
+      : _pimpl( new Impl() )
     {}
 
     Transaction::~Transaction()

diff --git a/zypp/sat/Transaction.h b/zypp/sat/Transaction.h
index 7fc6319..adf6aba 100644 (file)
--- a/zypp/sat/Transaction.h
+++ b/zypp/sat/Transaction.h
@@ -83,12 +83,9 @@ namespace zypp
        ZYPP_DECLARE_FLAGS(StepStages,StepStage);
 
      public:
-        /** Default ctor: empty transaction. */
+        /** Ctor: create transaction from ResPool. */
         Transaction();
 
-        /** Ctor cloning a sat transaction. */
-        Transaction( ::_Transaction & trans_r );
-
         /** Dtor */
         ~Transaction();
 

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index ff9a75f..4957540 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -365,7 +365,10 @@ bool Resolver::resolveQueue( solver::detail::SolverQueueItemList & queue )
 }
 
 sat::Transaction Resolver::getTransaction()
-{ return _satResolver->getTransaction(); }
+{
+    return sat::Transaction();
+}
+
 
 //----------------------------------------------------------------------------
 // Getting more information about the solve results

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 0559a5b..ca35b77 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -162,17 +162,6 @@ SATResolver::~SATResolver()
 
 //---------------------------------------------------------------------------
 
-sat::Transaction SATResolver::getTransaction()
-{
-  if ( !_solv )
-    return sat::Transaction();
-
-  ::Transaction * sattrans = ::solver_create_transaction( _solv );
-  sat::Transaction ret ( *sattrans );
-  ::transaction_free( sattrans );
-  return ret;
-}
-
 ResPool
 SATResolver::pool (void) const
 {

diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h
index df136dd..7aaef03 100644 (file)
--- a/zypp/solver/detail/SATResolver.h
+++ b/zypp/solver/detail/SATResolver.h
@@ -159,9 +159,6 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable {
     ResolverProblemList problems ();
     void applySolutions (const ProblemSolutionList &solutions);
 
-    // Return the Transaction computed by the last solver run.
-    sat::Transaction getTransaction();
-
     void addPoolItemToInstall (PoolItem item);
     void addPoolItemsToInstallFromList (PoolItemList & rl);