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 dc1180c5437fcbcae4008356367320236e608b02..ec9813197859c0d4886a5bf925b7209a3deb866f 100644 (file)
--- 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