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

svn path=/main/branches/2.1.2/; revision=9939

diff --git a/bin/emerge b/bin/emerge
index 85160bc401f1ae98c1e7a836d99d942bc2893944..0634ee2634fd4019ea95ea48a39be152e596dbf8 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1833,8 +1833,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