summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-02 04:42:44 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-02 04:42:44 +0000
commit19d8f495f8ffe7101c0d9d14b60b712f228d2c6c (patch)
tree73c07dfa66f9facebfcaa6b62867d4bd5c009ea8
parent9e20bc32b63ad043a6dcf0eb59eca420947fd046 (diff)
downloadportage-19d8f495f8ffe7101c0d9d14b60b712f228d2c6c.tar.gz
portage-19d8f495f8ffe7101c0d9d14b60b712f228d2c6c.tar.bz2
portage-19d8f495f8ffe7101c0d9d14b60b712f228d2c6c.zip
Grab /etc/profile.env from the target root instead of the configroot.
svn path=/main/trunk/; revision=4085
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 921033e27..ff821bcfa 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1020,7 +1020,7 @@ class config:
del blacklisted, cfg
env_d = getconfig(
- os.path.join(config_root, "etc", "profile.env"))
+ os.path.join(target_root, "etc", "profile.env"))
# env_d will be None if profile.env doesn't exist.
if env_d:
self.configdict["env.d"].update(env_d)
@@ -1409,7 +1409,7 @@ class config:
# We grab the latest profile.env here since it changes frequently.
self.configdict["env.d"].clear()
env_d = getconfig(
- os.path.join(self["PORTAGE_CONFIGROOT"], "etc", "profile.env"))
+ os.path.join(self["ROOT"], "etc", "profile.env"))
if env_d:
# env_d will be None if profile.env doesn't exist.
self.configdict["env.d"].update(env_d)