From 23d51c61186ae10926f09ed152ff7ae84a9ca45a Mon Sep 17 00:00:00 2001
From: Marius Mauch <genone@gentoo.org>
Date: Wed, 10 Jan 2007 04:34:47 +0000
Subject: make.globals has no business in profiles

svn path=/main/trunk/; revision=5508
---
 pym/portage.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pym/portage.py')

diff --git a/pym/portage.py b/pym/portage.py
index 985ee4e79..056a4c850 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1127,9 +1127,7 @@ class config:
 			del rawpuseforce
 
 			try:
-				mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) \
-					for x in self.profiles + [os.path.join(config_root, "etc")]]
-				self.mygcfg   = stack_dicts(mygcfg_dlists, incrementals=portage_const.INCREMENTALS, ignore_none=1)
+				self.mygcfg   = getconfig(os.path.join(config_root, "etc", "make.globals"))
 
 				if self.mygcfg is None:
 					self.mygcfg = {}
-- 
cgit v1.2.3-1-g7c22