Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12150 - main/trunk/pym/_emerge
Date: Thu, 04 Dec 2008 06:56:01
Message-Id: E1L887z-00022u-Le@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-12-04 06:55:58 +0000 (Thu, 04 Dec 2008)
3 New Revision: 12150
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Make sure depgraph._slot_conflict_explanation() doesn't display the same
9 atom more than once.
10
11
12 Modified: main/trunk/pym/_emerge/__init__.py
13 ===================================================================
14 --- main/trunk/pym/_emerge/__init__.py 2008-12-04 05:42:41 UTC (rev 12149)
15 +++ main/trunk/pym/_emerge/__init__.py 2008-12-04 06:55:58 UTC (rev 12150)
16 @@ -4543,7 +4543,7 @@
17 " reinstall '%s'." % matched_node.slot_atom
18
19 if matched_node.installed and not unmatched_node.installed:
20 - atoms = [atom for parent, atom in matched_atoms]
21 + atoms = sorted(set(atom for parent, atom in matched_atoms))
22 explanation = ("New USE for '%s' are incorrectly set. " + \
23 "In order to solve this, adjust USE to satisfy '%s'") % \
24 (matched_node.slot_atom, atoms[0])