summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-21 12:00:04 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-21 12:00:04 -0700
commit513b6f7282fe4d6b6ea0235f8dd30d5e18c548ef (patch)
treed319d5bdbbccb9a9546da0fef0888e8420fc3a4a
parent740c5e69dd2c428162d78284ad40a88ee74d8079 (diff)
downloadportage-513b6f7282fe4d6b6ea0235f8dd30d5e18c548ef.tar.gz
portage-513b6f7282fe4d6b6ea0235f8dd30d5e18c548ef.tar.bz2
portage-513b6f7282fe4d6b6ea0235f8dd30d5e18c548ef.zip
Revert back to using ROOT for env_update(), since that's how the
prefix branch does it.
-rw-r--r--pym/portage/dbapi/vartree.py5
-rw-r--r--pym/portage/util/env_update.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 60aacd071..a804652bc 100644
--- 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 14d35d8af..68531da59 100644
--- 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: