From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Nov 2007 20:02:50 +0000 (-0000)
Subject: make.globals should not be relative to config_root
X-Git-Tag: v2.1.4~274
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a2686391de52d74eb3fe8187835e691303ebd8e;p=portage.git

make.globals should not be relative to config_root
because it only contains constants. (trunk r8471)

svn path=/main/branches/2.1.2/; revision=8549
---

diff --git a/pym/portage.py b/pym/portage.py
index 8d98a3483..254ae0b1a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1233,8 +1233,10 @@ class config:
 				self.puseforce_list.append(cpdict)
 			del rawpuseforce
 
+			# make.globals should not be relative to config_root
+			# because it only contains constants.
 			try:
-				self.mygcfg   = getconfig(os.path.join(config_root, "etc", "make.globals"))
+				self.mygcfg   = getconfig(os.path.join("/etc", "make.globals"))
 
 				if self.mygcfg is None:
 					self.mygcfg = {}