vartree: add missing _merge_unicode_error import

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 70816b14522a117127e55c4a7175f0e7d3a978d0..ba2cc0886e789455481e064d7c02d27dfa49bf45 100644 (file)
--- 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 = []