Author: schubi2 Date: Fri Jan 25 15:17:10 2008 New Revision: 8371 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8371&view=rev Log: regarding SAT settings Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/sat/SATResolver.h trunk/libzypp/zypp/solver/detail/Resolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?rev=8371&r1=8370&r2=8371&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Jan 25 15:17:10 2008 @@ -372,7 +372,8 @@ bool SATResolver::resolvePool(const CapSet & requires_caps, - const CapSet & conflict_caps) + const CapSet & conflict_caps, + const bool updgradeMode) { SATCollectTransact info (*this); MIL << "SATResolver::resolvePool()" << endl; @@ -450,10 +451,20 @@ sat::Pool::instance().setDirty(); sat::Pool::instance().prepare(); solv->fixsystem = false; - solv->updatesystem = false; - solv->allowdowngrade = false; + solv->noupdateprovide = true; + + if (updgradeMode) { + MIL << "setting Upgrade Mode" << endl; + solv->updatesystem = true; + solv->allowdowngrade = true; + } else { + MIL << "setting NONE Upgrade Mode" << endl; + solv->updatesystem = false; + solv->allowdowngrade = false; + } + + solv->allowarchchange = true; solv->allowuninstall = false; - solv->noupdateprovide = false; // Solve ! MIL << "Starting solving...." << endl; Modified: trunk/libzypp/zypp/sat/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.h?rev=8371&r1=8370&r2=8371&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.h (original) +++ trunk/libzypp/zypp/sat/SATResolver.h Fri Jan 25 15:17:10 2008 @@ -97,9 +97,11 @@ int maxSolverPasses () const { return _maxSolverPasses; } ResPool pool (void) const; void setPool (const ResPool & pool) { _pool = pool; } + bool resolvePool(const CapSet & requires_caps, - const CapSet & conflict_caps); + const CapSet & conflict_caps, + const bool updgradeMode); ResolverProblemList problems (); void applySolutions (const ProblemSolutionList &solutions); Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.cc?rev=8371&r1=8370&r2=8371&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Fri Jan 25 15:17:10 2008 @@ -1334,7 +1334,8 @@ } MIL << "------SAT-Pool end------" << endl; #endif - return _satResolver->resolvePool (_extra_caps, _extra_conflicts); + return _satResolver->resolvePool (_extra_caps, _extra_conflicts, + _upgradeMode); } ResolverContext_Ptr saveContext = _best_context; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org