diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-19 20:29:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-19 20:29:48 +0000 |
| commit | 153ca0239f8ab2b6df27810974c7fe0d181acc30 (patch) | |
| tree | ab154eda6eafeb23ccd166ae1f91f58f8059c2f1 /pym | |
| parent | 39f6f115da4b86f0962e6b78915fc59b89b1ecaa (diff) | |
| download | portage-153ca0239f8ab2b6df27810974c7fe0d181acc30.tar.gz portage-153ca0239f8ab2b6df27810974c7fe0d181acc30.tar.bz2 portage-153ca0239f8ab2b6df27810974c7fe0d181acc30.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 8 |
1 files 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. |