diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-19 23:38:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-19 23:38:48 +0000 |
| commit | 105bdd289664c5899d2bd4206398d2da801dfcfc (patch) | |
| tree | 2671bc06e84aef0824f5a50c8b19352dacd50bc4 /pym/portage.py | |
| parent | 5a4361ca3561df37293081c7a8b675d4d6219af2 (diff) | |
| download | portage-105bdd289664c5899d2bd4206398d2da801dfcfc.tar.gz portage-105bdd289664c5899d2bd4206398d2da801dfcfc.tar.bz2 portage-105bdd289664c5899d2bd4206398d2da801dfcfc.zip | |
Adjust code order to organize it a bit.
svn path=/main/branches/2.1.2/; revision=10371
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage.py b/pym/portage.py index cfc998999..02e31965a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1471,11 +1471,6 @@ class config: # 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 @@ -1490,6 +1485,11 @@ class config: 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 = {} |