Revert back to using ROOT for env_update(), since that's how the

prefix branch does it.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 60aacd0717f7ebd8eee6e208f1c40be2f4169f31..a804652bce5aaf6757812f9ed8deba49b2383999 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2388,7 +2388,8 @@ class dblink(object):
                else:
                        self.settings.pop("PORTAGE_LOG_FILE", None)
 
-               env_update(target_root=self._eroot, prev_mtimes=ldpath_mtimes,
+               env_update(target_root=self.settings['ROOT'],
+                       prev_mtimes=ldpath_mtimes,
                        contents=contents, env=self.settings.environ(),
                        writemsg_level=self._display_merge)
                return os.EX_OK
@@ -4077,7 +4078,7 @@ class dblink(object):
 
                #update environment settings, library paths. DO NOT change symlinks.
                env_update(makelinks=(not downgrade),
-                       target_root=self._eroot, prev_mtimes=prev_mtimes,
+                       target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes,
                        contents=contents, env=self.settings.environ(),
                        writemsg_level=self._display_merge)
 

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index 14d35d8afffdcbdcf90ac998dd187865f7e20f03..68531da59bc43feb3f1935d159b4d0f40da1c45e 100644 (file)
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -29,13 +29,13 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
        Parse /etc/env.d and use it to generate /etc/profile.env, csh.env,
        ld.so.conf, and prelink.conf. Finally, run ldconfig.
        @param target_root: root that is passed to the ldconfig -r option,
-               defaults to portage.settings["EROOT"].
+               defaults to portage.settings["ROOT"].
        @type target_root: String (Path)
        """
        if writemsg_level is None:
                writemsg_level = portage.util.writemsg_level
        if target_root is None:
-               target_root = portage.settings["EROOT"]
+               target_root = portage.settings["ROOT"]
        if prev_mtimes is None:
                prev_mtimes = portage.mtimedb["ldpath"]
        if env is None: