From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 20 Aug 2010 01:46:12 +0000 (-0700)
Subject: Stop trying to read /etc/make.globals because it's been a symlink to
X-Git-Tag: v2.2_rc68~70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=133bdfe6d497d3e138512a777ddfee2c3aff1393;p=portage.git

Stop trying to read /etc/make.globals because it's been a symlink to
/usr/share/portage/config/make.globals since portage-2.1.6.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 3c3d72603..4893cfbb4 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -714,7 +714,7 @@ class config(object):
 
 			# make.globals should not be relative to config_root
 			# because it only contains constants.
-			for x in (GLOBAL_CONFIG_PATH, "/etc"):
+			for x in (GLOBAL_CONFIG_PATH,):
 				self.mygcfg = getconfig(os.path.join(x, "make.globals"),
 					expand=expand_map)
 				if self.mygcfg: