From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 4 Aug 2009 22:45:47 +0000 (-0000)
Subject: Avoid UnicodeEncodeError with unicode package.mask comments. Thanks to
X-Git-Tag: v2.2_rc36~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8198822a832c81d2346ef2725bad39022a7497cb;p=portage.git

Avoid UnicodeEncodeError with unicode package.mask comments. Thanks to
Thanks to Scott Moreau (soreau) for reporting.

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

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2b944ee51..aba41de41 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5111,6 +5111,11 @@ def show_masked_packages(masked_packages):
 				pass
 
 		print "- "+cpv+" (masked by: "+", ".join(mreasons)+")"
+
+		if sys.hexversion < 0x3000000 and isinstance(comment, unicode):
+			# avoid potential UnicodeEncodeError
+			comment = comment.encode('utf_8', 'replace')
+
 		if comment and comment not in shown_comments:
 			print filename+":"
 			print comment