Make sure depgraph._slot_conflict_explanation() doesn't display the same
authorZac Medico <zmedico@gentoo.org>
Thu, 4 Dec 2008 06:57:49 +0000 (06:57 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 4 Dec 2008 06:57:49 +0000 (06:57 -0000)
atom more than once. (trunk r12150)

svn path=/main/branches/2.1.6/; revision=12151

pym/_emerge/__init__.py

index d9bd04c1c840c6cc205bc556890fbdf2942cee78..f6ef588b2f7fe1dff5b56f6a95f206e53f9e1d24 100644 (file)
@@ -4527,7 +4527,7 @@ class depgraph(object):
                                " reinstall '%s'." % matched_node.slot_atom
 
                if matched_node.installed and not unmatched_node.installed:
-                       atoms = [atom for parent, atom in matched_atoms]
+                       atoms = sorted(set(atom for parent, atom in matched_atoms))
                        explanation = ("New USE for '%s' are incorrectly set. " + \
                                "In order to solve this, adjust USE to satisfy '%s'") % \
                                (matched_node.slot_atom, atoms[0])