summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-21 11:37:50 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-21 11:37:50 -0700
commit740c5e69dd2c428162d78284ad40a88ee74d8079 (patch)
treec6490a0a153cb8465d3e716546659e2186b45eda
parent42cab46428e69cf7423053b10940a275c38c04ff (diff)
downloadportage-740c5e69dd2c428162d78284ad40a88ee74d8079.tar.gz
portage-740c5e69dd2c428162d78284ad40a88ee74d8079.tar.bz2
portage-740c5e69dd2c428162d78284ad40a88ee74d8079.zip
Fix env_update() calls to use EROOT.
-rw-r--r--pym/portage/dbapi/vartree.py4
-rw-r--r--pym/portage/util/env_update.py5
2 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index b72cba024..60aacd071 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2388,7 +2388,7 @@ class dblink(object):
else:
self.settings.pop("PORTAGE_LOG_FILE", None)
- env_update(target_root=self.myroot, prev_mtimes=ldpath_mtimes,
+ env_update(target_root=self._eroot, prev_mtimes=ldpath_mtimes,
contents=contents, env=self.settings.environ(),
writemsg_level=self._display_merge)
return os.EX_OK
@@ -4077,7 +4077,7 @@ class dblink(object):
#update environment settings, library paths. DO NOT change symlinks.
env_update(makelinks=(not downgrade),
- target_root=self.settings["ROOT"], prev_mtimes=prev_mtimes,
+ target_root=self._eroot, 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 26fcf9ff7..14d35d8af 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -28,11 +28,14 @@ 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"].
+ @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["ROOT"]
+ target_root = portage.settings["EROOT"]
if prev_mtimes is None:
prev_mtimes = portage.mtimedb["ldpath"]
if env is None: