summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-14 12:39:17 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-14 12:39:17 -0700
commit8f91b6615617af839a31e51bd3bb2048ea81ea56 (patch)
tree6854b11e332f5152e6496f0e258e4dd2eca2a4b1
parent65f528c4627ffeb82b7cd6c37a1e83414636454c (diff)
downloadportage-8f91b6615617af839a31e51bd3bb2048ea81ea56.tar.gz
portage-8f91b6615617af839a31e51bd3bb2048ea81ea56.tar.bz2
portage-8f91b6615617af839a31e51bd3bb2048ea81ea56.zip
Prefer ~ and =* atoms in missed update display.
Hopefully this helps for bug #340983, similar to how it did for bug #291142.
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 424c4b27d..31f97ec15 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1389,13 +1389,13 @@ class depgraph(object):
if eliminate_pkg:
atom_pkg_graph.remove(pkg)
- # Yield < and <= atoms first, since those are more likely to
+ # Yield ~, =*, < and <= atoms first, since those are more likely to
# cause slot conflicts, and we want those atoms to be displayed
# in the resulting slot conflict message (see bug #291142).
less_than = []
not_less_than = []
for atom in cp_atoms:
- if atom.operator in ('<', '<='):
+ if atom.operator in ('~', '=*', '<', '<='):
less_than.append(atom)
else:
not_less_than.append(atom)