Author: schubi2 Date: Fri Jan 11 11:12:29 2008 New Revision: 8259 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8259&view=rev Log: disabled establish,freshens for SAT-solving Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.cc?rev=8259&r1=8258&r2=8259&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Fri Jan 11 11:12:29 2008 @@ -545,6 +545,11 @@ { UndoTransact resetting (ResStatus::APPL_HIGH); + if ( !getenv("ZYPP_RC_SOLVER")) { + WAR << "Will currently not be supported by the SAT-solver" << endl; + return true; + } + _DEBUG ("Resolver::verifySystem() " << (considerNewHardware ? "consider new hardware":"")); invokeOnEach ( _pool.begin(), _pool.end(), @@ -718,6 +723,11 @@ { MIL << "Resolver::establishPool()" << endl; + if ( !getenv("ZYPP_RC_SOLVER")) { + WAR << "Will not be supported by the SAT-solver" << endl; + return true; + } + establishState (); // establish ! ResolverContext_Ptr solution = bestContext(); @@ -844,6 +854,11 @@ { MIL << "Resolver::freshenPool()" << endl; + if ( !getenv("ZYPP_RC_SOLVER")) { + WAR << "Will not be supported by the SAT-solver" << endl; + return true; + } + freshenState (NULL, resetAfterSolve); // establish all packages with freshens; (NULL)= no initial context ResolverContext_Ptr solution = bestContext(); @@ -884,6 +899,10 @@ bool Resolver::resolveDependencies (const ResolverContext_Ptr context) { + if ( !getenv("ZYPP_RC_SOLVER")) { + WAR << "Will not be supported by the SAT-solver; use resolvepool instead" << endl; + return false; + } time_t t_start, t_now; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org