Bug #293730 - Fix bad || choices triggered in some cases inside

_dep_check_composite_db._visible() when --update is not enabled. (trunk r14854)

svn path=/main/branches/2.1.7/; revision=14865

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 446eb4a3f0594859835406ca7f7a0fb239ba704e..2cb10650a7b0c92bc88c7a44fa4980ffd6513812 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5278,7 +5278,10 @@ class _dep_check_composite_db(portage.dbapi):
                        # conflicts).
                        highest_visible, in_graph = self._depgraph._select_package(
                                self._root, pkg.slot_atom)
-                       if pkg != highest_visible:
+                       # Note: highest_visible is not necessarily the real highest
+                       # visible, especially when --update is not enabled, so use
+                       # < operator instead of !=.
+                       if pkg < highest_visible:
                                return False
                elif in_graph != pkg:
                        # Mask choices for packages that would trigger a slot