From a76308f072b67c1d938fe62811c569273504b661 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 21 Apr 2008 18:55:14 +0000 Subject: [PATCH] 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 --- bin/emerge | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/emerge b/bin/emerge index 85160bc40..0634ee263 100755 --- 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 -- 2.26.2