From aa7f1250b0454f95f037486e0b27cdfdd225bb95 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 May 2008 00:01:26 +0000 Subject: 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 --- pym/portage.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pym/portage.py') 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: -- cgit v1.2.3-1-g7c22