From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 8 Aug 2009 23:17:45 +0000 (-0000)
Subject: Convert scanelf output to unicode inside LinkageMap.rebuild().
X-Git-Tag: v2.2_rc37~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5;p=portage.git

Convert scanelf output to unicode inside LinkageMap.rebuild().

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index dc1180c54..ec9813197 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -303,6 +303,8 @@ class LinkageMap(object):
 				raise CommandNotFound(args[0])
 			else:
 				for l in proc.stdout:
+					if not isinstance(l, unicode):
+						l = unicode(l, encoding='utf_8', errors='replace')
 					l = l[3:].rstrip("\n")
 					if not l:
 						continue