In show_slot_collision_notice(), refer to the problem as a "slot conflict"

since that's how I'm refering to it in the docs.

svn path=/main/trunk/; revision=9938

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 84ea00005f7a6a0e6632eb98568971f5d55fa6b5..dfa2def65a34029483fb21ab2dfdf627c8d13c70 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1694,8 +1694,9 @@ class depgraph(object):
 
                msg = []
                msg.append("\n!!! Multiple versions within a single " + \
-                       "package slot have been \n")
-               msg.append("!!! pulled into the dependency graph:\n\n")
+                       "package slot have been pulled\n")
+               msg.append("!!! into the dependency graph, resulting" + \
+                       " in a slot conflict:\n\n")
                indent = "  "
                # Max number of parents shown, to avoid flooding the display.
                max_parents = 3