Stop trying to read /etc/make.globals because it's been a symlink to
authorZac Medico <zmedico@gentoo.org>
Fri, 20 Aug 2010 01:46:12 +0000 (18:46 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 20 Aug 2010 01:46:12 +0000 (18:46 -0700)
/usr/share/portage/config/make.globals since portage-2.1.6.

pym/portage/package/ebuild/config.py

index 3c3d726..4893cfb 100644 (file)
@@ -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: