diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-12 00:01:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-12 00:01:26 +0000 |
| commit | aa7f1250b0454f95f037486e0b27cdfdd225bb95 (patch) | |
| tree | 3722e14ab9bd1578958aaa913558ccdcd5735eac /pym/portage.py | |
| parent | 9513888e4dfdcb5cb2892f8490ec93f6e2518b65 (diff) | |
| download | portage-aa7f1250b0454f95f037486e0b27cdfdd225bb95.tar.gz portage-aa7f1250b0454f95f037486e0b27cdfdd225bb95.tar.bz2 portage-aa7f1250b0454f95f037486e0b27cdfdd225bb95.zip | |
Fix the variable subsitution code from bug #221755 so that variable
assignments from earlier files don't leak into variable assignments
from later files (except through substitution). (trunk r10294:10297)
svn path=/main/branches/2.1.2/; revision=10298
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index a48f23e3d..3947db8cd 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1440,12 +1440,9 @@ class config: self.make_defaults_use = [] self.mygcfg = {} if self.profiles: - mygcfg_dlists = [] - var_map = {} - for x in self.profiles: - var_map = getconfig(os.path.join(x, "make.defaults"), - expand=var_map) - mygcfg_dlists.append(var_map) + expand_map = {} + mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults"), + expand=expand_map) for x in self.profiles] for cfg in mygcfg_dlists: if cfg: |