From 153ca0239f8ab2b6df27810974c7fe0d181acc30 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 May 2008 20:29:48 +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. svn path=/main/trunk/; revision=10364 --- pym/portage/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b02bc5160..c8902b9bb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1282,14 +1282,17 @@ class config(object): # 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"), @@ -1301,7 +1304,6 @@ class config(object): # 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