From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Jun 2008 22:41:40 +0000 (-0000)
Subject: Fix Atom -> str breakage in depgraph._show_slot_collision_notice(). Thanks
X-Git-Tag: v2.2_rc2~356
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0416fae959d1664821a35b232a3cf62e264c005a;p=portage.git

Fix Atom -> str breakage in depgraph._show_slot_collision_notice(). Thanks
to Arfrever for reporting.

svn path=/main/trunk/; revision=10758
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 900c65386..cb017c9bc 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2049,7 +2049,7 @@ class depgraph(object):
 		# Max number of parents shown, to avoid flooding the display.
 		max_parents = 3
 		for slot_atom, root in self._slot_collision_info:
-			msg.append(slot_atom)
+			msg.append(str(slot_atom))
 			msg.append("\n\n")
 			slot_nodes = []
 			for node in self._slot_collision_nodes: