Merged from trunk -r13956:13957

   | 13957   | Convert scanelf output to unicode inside                     |
   | zmedico | LinkageMap.rebuild().                                        |

svn path=/main/branches/prefix/; revision=14035

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a64b15fa88518062730f76cfb259eb9f028273b4..d6d6f878fd150a81d9de65a9516e0495d5ee6661 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -304,6 +304,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