[zypp-commit] r11439 - in /trunk/libzypp/zypp: DiskUsageCounter.cc sat/detail/PoolImpl.cc solver/detail/SATResolver.cc

Author: mlandres Date: Wed Oct 22 13:03:11 2008 New Revision: 11439 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11439&view=rev Log: - Adapt to satsolver-0.12 API. Modified: trunk/libzypp/zypp/DiskUsageCounter.cc trunk/libzypp/zypp/sat/detail/PoolImpl.cc trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc?rev=11439&r1=11438&r2=11439&view=diff ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.cc (original) +++ trunk/libzypp/zypp/DiskUsageCounter.cc Wed Oct 22 13:03:11 2008 @@ -67,13 +67,6 @@ } 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 @@ // now calc... ::pool_calc_duchanges( satpool.get(), - satpool.systemRepo().get(), &installedmap_r._installedmap, &duchanges[0], duchanges.size() ); Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=11439&r1=11438&r2=11439&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Wed Oct 22 13:03:11 2008 @@ -153,7 +153,7 @@ ::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 @@ 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 ) Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=11439&r1=11438&r2=11439&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Wed Oct 22 13:03:11 2008 @@ -432,7 +432,7 @@ 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 @@ functor::not_c(resfilter::byKind<Package>()), // every solvable BUT packages functor::functorRef (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 @@ // 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; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org