Adjust code order to organize it a bit. (branches/2.1.2 r10371)

svn path=/main/trunk/; revision=10372

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e0d99e6e8b90d6e9e6664c53297f4b6ed64daa95..274354016853ad4801272e302b32228b2971e046 100644 (file)
--- 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 = {}