From: Zac Medico Date: Thu, 14 Oct 2010 19:39:17 +0000 (-0700) Subject: Prefer ~ and =* atoms in missed update display. X-Git-Tag: v2.2_rc97~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f91b6615617af839a31e51bd3bb2048ea81ea56;p=portage.git Prefer ~ and =* atoms in missed update display. Hopefully this helps for bug #340983, similar to how it did for bug #291142. --- 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)