summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-08 23:17:45 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-08 23:17:45 +0000
commit9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5 (patch)
tree9fbd0f5fa2e12b43e10619dfeb5813576c4cad8d
parent4e238eae57c81722b1bba4ccdbd760ebf937217a (diff)
downloadportage-9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5.tar.gz
portage-9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5.tar.bz2
portage-9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5.zip
Convert scanelf output to unicode inside LinkageMap.rebuild().
svn path=/main/trunk/; revision=13957
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 2 insertions, 0 deletions
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