ref: refs/heads/ma-misc
commit d1ebf2946a9c681d04a5557eddb0d312d96dd792
Author: Michael Andres
Date: Thu Oct 29 16:54:15 2009 +0100
Fix upgradeRepo solution to keep obsolete packages. (bnc #550915)
---
zypp/solver/detail/SATResolver.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 849c8ab..c76bad3 100644
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -1211,7 +1211,7 @@ SATResolver::problems ()
s = mapSolvable (rp);
PoolItem poolItem = _pool.find (s);
if (_solv->installed && s.get()->repo == _solv->installed) {
- problemSolution->addSingleAction (poolItem, KEEP);
+ problemSolution->addSingleAction (poolItem, LOCK);
string description = str::form (_("keep %s despite the inferior architecture"), s.asString().c_str());
MIL << description << endl;
problemSolution->addDescription (description);
@@ -1225,7 +1225,7 @@ SATResolver::problems ()
s = mapSolvable (rp);
PoolItem poolItem = _pool.find (s);
if (_solv->installed && s.get()->repo == _solv->installed) {
- problemSolution->addSingleAction (poolItem, KEEP);
+ problemSolution->addSingleAction (poolItem, LOCK);
string description = str::form (_("keep obsolete %s"), s.asString().c_str());
MIL << description << endl;
problemSolution->addDescription (description);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
