From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 19 May 2008 23:39:15 +0000 (-0000)
Subject: Adjust code order to organize it a bit. (branches/2.1.2 r10371)
X-Git-Tag: v2.2_pre7~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7370dc39166faaced1d4561846fa1bdfba4a30d1;p=portage.git

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 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 = {}