From 9939ba64b8b1ddb34e9d51cf266d8c8bd87b48c5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 8 Aug 2009 23:17:45 +0000 Subject: [PATCH] Convert scanelf output to unicode inside LinkageMap.rebuild(). svn path=/main/trunk/; revision=13957 --- pym/portage/dbapi/vartree.py | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.26.2