From 1781f3603402325a85c46d85ab4ac594e380fec7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 21 Apr 2008 18:54:38 +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. svn path=/main/trunk/; revision=9938 --- pym/_emerge/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 84ea00005..dfa2def65 100644 --- 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 -- 2.26.2