Author: schubi2 Date: Tue Oct 28 10:05:37 2008 New Revision: 11517 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11517&view=rev Log: regarding keep obsolete in the solutions (bnc #439134) Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=11517&r1=11516&r2=11517&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Tue Oct 28 10:05:37 2008 @@ -1186,7 +1186,20 @@ sd = mapSolvable (rp); PoolItem itemFrom = _pool.find (s); - if (rp) + if (s == sd && _solv->distupgrade) + { + PoolItem poolItem = _pool.find (s); + if (poolItem) { + problemSolution->addSingleAction (poolItem, KEEP); + string description = str::form (_("keep %s"), solvable2str(pool, s.get())); + MIL << description << endl; + problemSolution->addDescription (description); + } else { + ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" + << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) << endl; + } + } + else if (rp) { int gotone = 0; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org