From fb1a654e2ef880342a610ce1d4a2bfc87a2f737d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 6 Oct 2006 03:28:25 +0000 Subject: Don't call varexpand inside getconfig for env.d/profile.env values. svn path=/main/trunk/; revision=4603 --- pym/portage.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/portage.py') diff --git a/pym/portage.py b/pym/portage.py index 403caa7ef..eafaf46d3 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -570,7 +570,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None): for x in fns: file_path = os.path.join(envd_dir, x) try: - myconfig = getconfig(file_path) + myconfig = getconfig(file_path, expand=False) except portage_exception.ParseError, e: writemsg("!!! '%s'\n" % str(e), noiselevel=-1) del e @@ -1127,7 +1127,7 @@ class config: del blacklisted, cfg env_d = getconfig( - os.path.join(target_root, "etc", "profile.env")) + os.path.join(target_root, "etc", "profile.env"), expand=False) # env_d will be None if profile.env doesn't exist. if env_d: self.configdict["env.d"].update(env_d) @@ -1530,7 +1530,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["ROOT"], "etc", "profile.env")) + os.path.join(self["ROOT"], "etc", "profile.env"), expand=False) if env_d: # env_d will be None if profile.env doesn't exist. self.configdict["env.d"].update(env_d) -- cgit v1.2.3-1-g7c22