diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:05:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:05:30 +0000 |
| commit | ccca8ab161b499c6aa467bd405d10b419cd3b349 (patch) | |
| tree | 1365da36b12b42431dcbd78dba249078a6834c47 | |
| parent | Disable backtracking in the depgraph constructor call when appropriate. (diff) | |
| download | portage-ccca8ab161b499c6aa467bd405d10b419cd3b349.tar.gz portage-ccca8ab161b499c6aa467bd405d10b419cd3b349.tar.bz2 portage-ccca8ab161b499c6aa467bd405d10b419cd3b349.zip | |
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
| -rw-r--r-- | pym/_emerge/depgraph.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 446eb4a3f..2cb10650a 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 |