From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 14 Aug 2009 20:16:55 +0000 (-0000)
Subject:    Merged from trunk -r13956:13957
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=89db405ac4ce07ed419173f7e6012423ed015670;p=portage.git

   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 a64b15fa8..d6d6f878f 100644
--- 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