env_update: use global vardbapi as fallback

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index 71dcf376a60fdf52e6d595da5ea4ec1519b04f31..78bef82fabd930f4105d4eed1ebe329316482f77 100644 (file)
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -20,6 +20,7 @@ from portage.util import atomic_ofstream, ensure_dirs, getconfig, \
        normalize_path, writemsg
 from portage.util.listdir import listdir
 from portage.dbapi.vartree import vartree
+from portage.package.ebuild.config import config
 
 if sys.hexversion >= 0x3000000:
        long = int
@@ -41,7 +42,12 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
        @type target_root: String (Path)
        """
        if vardbapi is None:
-               vardbapi = vartree(settings=portage.settings).dbapi
+               if isinstance(env, config):
+                       vardbapi = vartree(settings=env).dbapi
+               else:
+                       if target_root is None:
+                               target_root = portage.settings["ROOT"]
+                       vardbapi = portage.db[target_root]["vartree"].dbapi
 
        # Lock the config memory file to prevent symlink creation
        # in merge_contents from overlapping with env-update.