From 5f36c04816f9abfd9d4404f2f3999f5b09d324b0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 Nov 2009 06:07:41 +0000 Subject: [PATCH] Bug #293730 - Fix bad || choices triggered in some cases inside _dep_check_composite_db._visible() when --update is not enabled. svn path=/main/trunk/; revision=14854 --- pym/_emerge/depgraph.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index fa4b1079b..73eff9fa9 100644 --- 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 -- 2.26.2