From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 16 Nov 2008 07:26:12 +0000 (-0000)
Subject: When a "slot conflict" occurs due to USE dependencies, display the usual
X-Git-Tag: v2.2_rc15~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4efca06b864d01c2c3d8d11bf7481bd8cb455b14;p=portage.git

When a "slot conflict" occurs due to USE dependencies, display the usual
slot conflict output together with the unsatisfied USE dependency output,
since both might be useful.

svn path=/main/trunk/; revision=11960
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index dfe0be3c9..415c9595a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4330,7 +4330,7 @@ class depgraph(object):
 		self._show_merge_list()
 
 		msg = []
-		msg.append("\n!!! Multiple versions within a single " + \
+		msg.append("\n!!! Multiple package instances within a single " + \
 			"package slot have been pulled\n")
 		msg.append("!!! into the dependency graph, resulting" + \
 			" in a slot conflict:\n\n")
@@ -4601,6 +4601,9 @@ class depgraph(object):
 						# as an unsatisfied dependency.
 						self._unsatisfied_deps_for_display.append(
 							((dep.root, dep.atom), {"myparent":dep.parent}))
+						self._slot_collision_info.add((pkg.slot_atom, pkg.root))
+						self._slot_collision_nodes.add(pkg)
+						self.digraph.addnode(pkg, myparent, priority=priority)
 						return 0
 
 					if pkg in self._slot_collision_nodes: