From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Dec 2011 19:43:11 +0000 (-0800)
Subject: _aux_env_search: decode unicode more
X-Git-Tag: v2.2.0_alpha82~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08e4be7fa43c99b9acbfe30982d51ef6f881c000;p=portage.git

_aux_env_search: decode unicode more
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d93d3c2ea..b9ef58341 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -798,6 +798,9 @@ class vardbapi(dbapi):
 					else:
 						value = [var_assign_match.group(4)]
 						for line in proc.stdout:
+							line = _unicode_decode(line,
+								encoding=_encodings['content'],
+								errors='replace')
 							value.append(line)
 							if have_end_quote(quote, line):
 								break