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. (trunk r11960)

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index de5c903efe39ac43a30e1f14f692611a5ea76a2c..1b9e1858914d3e7840d997ab46c3f4192ee3522d 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4314,7 +4314,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")
@@ -4585,6 +4585,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: