Adjust code order to organize it a bit.

svn path=/main/branches/2.1.2/; revision=10371

diff --git a/pym/portage.py b/pym/portage.py
index cfc998999ddd6e0aabae4d4884dcce36902e22de..02e31965a3491bc2b79163d32c56a0485685d27c 100644 (file)
--- 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 = {}