diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-19 23:39:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-19 23:39:15 +0000 |
| commit | 7370dc39166faaced1d4561846fa1bdfba4a30d1 (patch) | |
| tree | 1ddd2406ecb86e35dd48392eaf281785963a0783 /pym | |
| parent | 8142d9cc696c9620b6e7241c6e3800f893fa6026 (diff) | |
| download | portage-7370dc39166faaced1d4561846fa1bdfba4a30d1.tar.gz portage-7370dc39166faaced1d4561846fa1bdfba4a30d1.tar.bz2 portage-7370dc39166faaced1d4561846fa1bdfba4a30d1.zip | |
Adjust code order to organize it a bit. (branches/2.1.2 r10371)
svn path=/main/trunk/; revision=10372
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e0d99e6e8..274354016 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1311,11 +1311,6 @@ class config(object): # backupenv is used for calculating incremental variables. self.backupenv = os.environ.copy() - # make.globals should not be relative to config_root - # because it only contains constants. - self.mygcfg = getconfig(os.path.join("/etc", "make.globals"), - expand=expand_map) - if env_d: # Remove duplicate values so they don't override updated # profile.env values later (profile.env is reloaded in each @@ -1330,6 +1325,11 @@ class config(object): self.configdict["env"] = self.backupenv.copy() + # make.globals should not be relative to config_root + # because it only contains constants. + self.mygcfg = getconfig(os.path.join("/etc", "make.globals"), + expand=expand_map) + if self.mygcfg is None: self.mygcfg = {} |