Taking "unlock" instead of setTransact(false) in the solutions (bnc

#436923)

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 5f6d345..82bff11 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri Oct 24 10:29:19 CEST 2008 - schubi@suse.de
+
+- Taking "unlock" instead of setTransact(false) in the solutions (bnc #436923)
+
+-------------------------------------------------------------------
 Wed Oct 22 14:33:10 CEST 2008 - ma@suse.de
 
 - For retrieving a product license fall back to license.tar.gz. (bnc #372386)

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 2bd2a49..6fa2a6f 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -1075,7 +1075,7 @@ SATResolver::problems ()
                                        MIL << description << endl;
                                        problemSolution->addDescription (description);
                                    } else {
-                                       problemSolution->addSingleAction (poolItem, KEEP);
+                                       problemSolution->addSingleAction (poolItem, UNLOCK);
                                        string description = str::form (_("do not forbid installation of %s"), itemToString(poolItem, false).c_str());
                                        MIL << description << endl;
                                        problemSolution->addDescription (description);