Author: schubi2 Date: Thu Jan 24 17:20:26 2008 New Revision: 8367 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8367&view=rev Log: setting SAT-solver flags for update and verify Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc?rev=8367&r1=8366&r2=8367&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc Thu Jan 24 17:20:26 2008 @@ -436,11 +436,6 @@ _solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() ); sat::Pool::instance().setDirty(); sat::Pool::instance().prepare(); - _solv->fixsystem = false; - _solv->updatesystem = false; - _solv->allowdowngrade = false; - _solv->allowuninstall = false; - _solv->noupdateprovide = false; // Solve ! MIL << "Starting solving...." << endl; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h?rev=8367&r1=8366&r2=8367&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h Thu Jan 24 17:20:26 2008 @@ -64,7 +64,6 @@ Solver *_solv; Queue _jobQueue; - // list populated by calls to addPoolItemTo*() PoolItemList _items_to_install; PoolItemList _items_to_remove; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc?rev=8367&r1=8366&r2=8367&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc Thu Jan 24 17:20:26 2008 @@ -64,10 +64,12 @@ //--------------------------------------------------------------------------- Resolver::Resolver (const ResPool & pool) - : _pool (pool) - , _satResolver (NULL) - , _poolchanged( _pool.serial() ) - , _forceResolve (false) + : _pool(pool) + , _satResolver(NULL) + , _poolchanged(_pool.serial() ) + , _forceResolve(false) + , _upgradeMode(false) + , _verifying(false) { @@ -89,7 +91,7 @@ void Resolver::reset (bool keepExtras ) { - _items_to_verify.clear(); + _verifying = false; if (!keepExtras) { _extra_requires.clear(); @@ -97,15 +99,6 @@ } } - -void -Resolver::addPoolItemToVerify (PoolItem_Ref item) -{ - - _items_to_verify.push_back (item); -} - - void Resolver::addExtraRequire (const Capability & capability) { @@ -201,55 +194,20 @@ }; -struct VerifySystem : public resfilter::PoolItemFilterFunctor -{ - Resolver & resolver; - - VerifySystem (Resolver & r) - : resolver (r) - { } - - bool operator()( PoolItem_Ref provider ) - { - resolver.addPoolItemToVerify (provider); - return true; - } -}; - bool Resolver::verifySystem () { UndoTransact resetting (ResStatus::APPL_HIGH); _DEBUG ("Resolver::verifySystem() "); + + _verifying = true; invokeOnEach ( _pool.begin(), _pool.end(), resfilter::ByTransact( ), // Resetting all transcations functor::functorRef(resetting) ); - VerifySystem info (*this); - - invokeOnEach( pool().byKindBegin( ResTraits<Package>::kind ), - pool().byKindEnd( ResTraits<Package>::kind ), - resfilter::ByInstalled ( ), - functor::functorRef(info) ); - - invokeOnEach( pool().byKindBegin( ResTraits<Pattern>::kind ), - pool().byKindEnd( ResTraits<Pattern>::kind ), - resfilter::ByInstalled ( ), - functor::functorRef(info) ); - -// FIXME setting verify mode -#if 0 - bool success = resolveDependencies (); // do solve only - - DoTransact setting (ResStatus::APPL_HIGH); - - invokeOnEach ( _pool.begin(), _pool.end(), - resfilter::ByTransact( ), - functor::functorRef(setting) ); -#endif - return true; // FIXME success + return resolvePool(); } @@ -304,6 +262,29 @@ } MIL << "------SAT-Pool end------" << endl; #endif + _satResolver->setFixsystem(false); + _satResolver->setAllowdowngrade(false); + _satResolver->setAllowarchchange(false); + _satResolver->setAllowvendorchange(false); + _satResolver->setAllowuninstall(false); + _satResolver->setUpdatesystem(false); + _satResolver->setAllowvirtualconflicts(false); + _satResolver->setNoupdateprovide(true); + _satResolver->setDosplitprovides(false); + + if (_upgradeMode) { + _satResolver->setAllowdowngrade(true); + _satResolver->setAllowarchchange(true); + _satResolver->setUpdatesystem(true); + _satResolver->setDosplitprovides(true); + } + + if (_forceResolve) + _satResolver->setAllowuninstall(true); + + if (_verifying) + _satResolver->setFixsystem(true); + return _satResolver->resolvePool(_extra_requires, _extra_conflicts); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h?rev=8367&r1=8366&r2=8367&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h Thu Jan 24 17:20:26 2008 @@ -68,9 +68,6 @@ SerialNumberWatcher _poolchanged; bool _testing; - // list populated by calls to addPoolItemTo*() - PoolItemList _items_to_verify; - // list of problematic items after doUpgrade() PoolItemList _update_items; @@ -99,7 +96,7 @@ // have unfulfilled requirements. // This behaviour is favourited by ZMD bool _upgradeMode; // Resolver has been called with doUpgrade - //if there are more solver results. + bool _verifying; // The system will be checked // helpers bool doesObsoleteCapability (PoolItem_Ref candidate, const Capability & cap); @@ -122,8 +119,6 @@ ResPool pool (void) const; void setPool (const ResPool & pool) { _pool = pool; } - void addPoolItemToVerify (PoolItem_Ref item); - void addExtraRequire (const Capability & capability); void removeExtraRequire (const Capability & capability); void addExtraConflict (const Capability & capability); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org