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-15 03:05:19 -0700
commitc6cead137cfbbb65e26267233b3a5bf1b6d0b2be (patch)
treeca32ad53c356eb19ba9dbe3fdaafbbb5e9d08632
parent1931b7f7b8be5dc13df1d099b95399339b8780ff (diff)
downloadportage-c6cead137cfbbb65e26267233b3a5bf1b6d0b2be.tar.gz
portage-c6cead137cfbbb65e26267233b3a5bf1b6d0b2be.tar.bz2
portage-c6cead137cfbbb65e26267233b3a5bf1b6d0b2be.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 4b0257ad7..e9e62a2c9 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1405,13 +1405,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)