From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 19 May 2008 23:38:48 +0000 (-0000)
Subject: Adjust code order to organize it a bit.
X-Git-Tag: v2.1.5.2~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=105bdd289664c5899d2bd4206398d2da801dfcfc;p=portage.git

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