diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-08-02 03:24:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-08-02 03:24:30 +0000 |
| commit | 9e20bc32b63ad043a6dcf0eb59eca420947fd046 (patch) | |
| tree | 5c2fd7750de8b351a437071937e8b5279d672dfc /pym | |
| parent | bcd106c2f2505345ed6e07c4a70390a084fa934b (diff) | |
| download | portage-9e20bc32b63ad043a6dcf0eb59eca420947fd046.tar.gz portage-9e20bc32b63ad043a6dcf0eb59eca420947fd046.tar.bz2 portage-9e20bc32b63ad043a6dcf0eb59eca420947fd046.zip | |
Move profile.env to the bottom of the stack so that, for example, it's possible for make.conf values to override or stack incrementally with values from profile.env. See bug #51370.
svn path=/main/trunk/; revision=4084
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pym/portage.py b/pym/portage.py index dc4ea15df..921033e27 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -806,14 +806,15 @@ class config: self.configlist = copy.deepcopy(clone.configlist) self.lookuplist = self.configlist[:] self.lookuplist.reverse() - self.configdict = { "globals": self.configlist[0], - "defaults": self.configlist[1], - "conf": self.configlist[2], - "pkg": self.configlist[3], - "auto": self.configlist[4], - "env.d": self.configlist[5], - "backupenv": self.configlist[6], - "env": self.configlist[7] } + self.configdict = { + "env.d": self.configlist[0], + "globals": self.configlist[1], + "defaults": self.configlist[2], + "conf": self.configlist[3], + "pkg": self.configlist[4], + "auto": self.configlist[5], + "backupenv": self.configlist[6], + "env": self.configlist[7] } self.profiles = copy.deepcopy(clone.profiles) self.backupenv = self.configdict["backupenv"] self.pusedict = copy.deepcopy(clone.pusedict) @@ -877,7 +878,9 @@ class config: # back up our incremental variables: self.configdict={} - # configlist will contain: [ globals, defaults, conf, pkg, auto, backupenv (incrementals), origenv ] + # configlist will contain: [ env.d, globals, defaults, conf, pkg, auto, backupenv, env ] + self.configlist.append({}) + self.configdict["env.d"] = self.configlist[-1] # The symlink might not exist or might not be a symlink. if self.profile_path is None: @@ -996,9 +999,6 @@ class config: self.configlist.append({}) self.configdict["auto"]=self.configlist[-1] - self.configlist.append({}) - self.configdict["env.d"] = self.configlist[-1] - self.configlist.append(self.backupenv) # XXX Why though? self.configdict["backupenv"]=self.configlist[-1] |