From d318bcce356b55d481e78b8cf511d6698f67eee5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 2 Sep 2011 08:06:58 -0700 Subject: [PATCH] vartree: add missing _merge_unicode_error import --- pym/portage/dbapi/vartree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [] -- 2.26.2