From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Sep 2011 15:06:58 +0000 (-0700)
Subject: vartree: add missing _merge_unicode_error import
X-Git-Tag: v2.2.0_alpha52~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d318bcce356b55d481e78b8cf511d6698f67eee5;p=portage.git

vartree: add missing _merge_unicode_error import
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 70816b145..ba2cc0886 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -18,7 +18,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.locks:lockdir,unlockdir,lockfile,unlockfile',
 	'portage.output:bold,colorize',
 	'portage.package.ebuild.doebuild:doebuild_environment,' + \
-		'_spawn_phase',
+		'_merge_unicode_error', '_spawn_phase',
 	'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
 	'portage.update:fixdbentries',
 	'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \
@@ -3352,7 +3352,7 @@ class dblink(object):
 				break
 
 		if unicode_errors:
-			eerror(portage._merge_unicode_error(unicode_errors))
+			eerror(_merge_unicode_error(unicode_errors))
 
 		if paths_with_newlines:
 			msg = []