* [gentoo-commits] portage r14854 - main/trunk/pym/_emerge
@ 2009-11-20 6:07 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-11-20 6:07 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-11-20 06:07:41 +0000 (Fri, 20 Nov 2009)
New Revision: 14854
Modified:
main/trunk/pym/_emerge/depgraph.py
Log:
Bug #293730 - Fix bad || choices triggered in some cases inside
_dep_check_composite_db._visible() when --update is not enabled.
Modified: main/trunk/pym/_emerge/depgraph.py
===================================================================
--- main/trunk/pym/_emerge/depgraph.py 2009-11-20 05:32:05 UTC (rev 14853)
+++ main/trunk/pym/_emerge/depgraph.py 2009-11-20 06:07:41 UTC (rev 14854)
@@ -5278,7 +5278,10 @@
# 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-20 6:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-20 6:07 [gentoo-commits] portage r14854 - main/trunk/pym/_emerge Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox