- Adapt to satsolver-0.12 API.

diff --git a/zypp/DiskUsageCounter.cc b/zypp/DiskUsageCounter.cc
index 9246da8..98c4883 100644 (file)
--- a/zypp/DiskUsageCounter.cc
+++ b/zypp/DiskUsageCounter.cc
@@ -67,13 +67,6 @@ namespace zypp
       }
 
       sat::Pool satpool( sat::Pool::instance() );
-      if ( ! satpool.findSystemRepo() )
-      {
-        // take care we have at least an empty stystem repo.
-        // ::pool_calc_duchanges requires it.
-        satpool.systemRepo();
-        satpool.prepare();
-      }
 
       // init satsolver result vector with mountpoints
       static const ::DUChanges _initdu = { 0, 0, 0 };
@@ -89,7 +82,6 @@ namespace zypp
 
       // now calc...
       ::pool_calc_duchanges( satpool.get(),
-                             satpool.systemRepo().get(),
                              &installedmap_r._installedmap,
                              &duchanges[0],
                              duchanges.size() );

diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc
index aa02990..4124ca5 100644 (file)
--- a/zypp/sat/detail/PoolImpl.cc
+++ b/zypp/sat/detail/PoolImpl.cc
@@ -153,7 +153,7 @@ namespace zypp
            ::pool_setdebuglevel( _pool, 2 );
        else
            ::pool_setdebugmask(_pool, SAT_DEBUG_STATS | SAT_DEBUG_JOB);
-       
+
         ::pool_setdebugcallback( _pool, logSat, NULL );
 
         // set namespace callback
@@ -210,13 +210,7 @@ namespace zypp
         if ( ! _pool->whatprovides )
         {
           MIL << "pool_createwhatprovides..." << endl;
-
-          // NOTE: Thake care not to ctreate a nonexisting systemRepo
-          Repository sysrepo( sat::Pool::instance().reposFind( sat::Pool::instance().systemRepoAlias() ) );
-          if ( sysrepo )
-          {
-            ::pool_addfileprovides( _pool, sysrepo.get() );
-          }
+          ::pool_addfileprovides( _pool );
           ::pool_createwhatprovides( _pool );
         }
         if ( ! _pool->languages )

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 4660c76..301c193 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -432,7 +432,7 @@ class CollectNonePackages : public resfilter::PoolItemFilterFunctor
 bool
 SATResolver::solving()
 {
-    _solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() );
+    _solv = solver_create( _SATPool );
     _solv->vendorCheckCb = &vendorCheck;
     _solv->fixsystem = _fixsystem;
     _solv->ignorealreadyrecommended = _ignorealreadyrecommended;
@@ -571,7 +571,7 @@ SATResolver::solving()
                  functor::not_c(resfilter::byKind<Package>()), // every solvable BUT packages
                  functor::functorRef<bool,PoolItem> (collectNonePackages) );
     solver_create_state_maps(_solv, &installedmap, 0);
-    pool_trivial_installable(_solv->pool, _solv->installed, &installedmap, &solvableQueue, &flags);
+    pool_trivial_installable(_solv->pool, &installedmap, &solvableQueue, &flags);
     for (int i = 0; i < solvableQueue.count; i++) {
        PoolItem item = _pool.find (sat::Solvable(solvableQueue.elements[i]));
        item.status().setUndetermined();
@@ -777,7 +777,7 @@ void SATResolver::doUpdate()
     // set locks for the solver
     void setLocks();
 
-    _solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() );
+    _solv = solver_create( _SATPool );
     _solv->vendorCheckCb = &vendorCheck;
 
     _solv->updatesystem = true;