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 2b944ee5129f221f9e44c339253348dc0e384683..aba41de41c04185fcbd85449a302ffa5a7ff171f 100644 (file)
--- 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