Prefer ~ and =* atoms in missed update display.
authorZac Medico <zmedico@gentoo.org>
Thu, 14 Oct 2010 19:39:17 +0000 (12:39 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 15 Oct 2010 10:05:19 +0000 (03:05 -0700)
Hopefully this helps for bug #340983, similar to how it did for
bug #291142.

pym/_emerge/depgraph.py

index 4b0257ad7618a0052486b00a2cadc937ad853070..e9e62a2c95b8396a38c91cb409ea15658377930b 100644 (file)
@@ -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)