From b56bfb196e53de95efcb952cfa5ec3001c754bd4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 May 2008 20:31:24 +0000 Subject: [PATCH] Exclude "env" from use in variable substitution since we want to avoid any interaction with the calling environment that might lead to unexpected results. (trunk r10364) svn path=/main/branches/2.1.2/; revision=10365 --- pym/portage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 04c4a7ebd..84fe11188 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1442,14 +1442,17 @@ class config: # in getconfig() calls, and the getconfig() calls # update expand_map with the value of each variable # assignment that occurs. Variable substitution occurs - # in the following order: + # in the following order, which corresponds to the + # order of appearance in self.lookuplist: # # * env.d - # * env # * make.globals # * make.defaults # * make.conf # + # Notably absent is "env", since we want to avoid any + # interaction with the calling environment that might + # lead to unexpected results. expand_map = {} env_d = getconfig(os.path.join(target_root, "etc", "profile.env"), @@ -1461,7 +1464,6 @@ class config: # backupenv is used for calculating incremental variables. self.backupenv = os.environ.copy() - expand_map.update(self.backupenv) # make.globals should not be relative to config_root # because it only contains constants. -- 2.26.2