summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-04 06:57:49 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-04 06:57:49 +0000
commit69617a434d013d6f57d01f85a14baadb07a67d21 (patch)
tree51138cd88dbcbb695b604a3b8b4bc551a636c47d
parentb29eea663a323d0d3c06d3a0d6fc91a33bcb6e94 (diff)
downloadportage-69617a434d013d6f57d01f85a14baadb07a67d21.tar.gz
portage-69617a434d013d6f57d01f85a14baadb07a67d21.tar.bz2
portage-69617a434d013d6f57d01f85a14baadb07a67d21.zip
Make sure depgraph._slot_conflict_explanation() doesn't display the same
atom more than once. (trunk r12150) svn path=/main/branches/2.1.6/; revision=12151
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d9bd04c1c..f6ef588b2 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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])