summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-19 18:46:12 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-19 18:46:12 -0700
commit133bdfe6d497d3e138512a777ddfee2c3aff1393 (patch)
tree0c871a61eeda4ea017b1e7277c361ecf57d58353 /pym
parent59d49a224ea5d008ce9eb2cdd312e3f46870fa4b (diff)
downloadportage-133bdfe6d497d3e138512a777ddfee2c3aff1393.tar.gz
portage-133bdfe6d497d3e138512a777ddfee2c3aff1393.tar.bz2
portage-133bdfe6d497d3e138512a777ddfee2c3aff1393.zip
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.
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/package/ebuild/config.py2
1 files changed, 1 insertions, 1 deletions
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: