MAKE_CONF_FILE: refer to /etc/portage/make.conf

This is, or will soon soon be the default location of make.conf in
stages:

http://sources.gentoo.org/gitweb/?p=proj/gentoo-news.git;a=blob_plain;f=2012/2012-09-09-make.conf-and-make.profile-move/2012-09-09-make.conf-and-make.profile-move.en.txt

This update is consistent with the PROFILE_PATH update in commit
96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 1ebfdc8ef3bf2bcbe9423689ef5c04f1def0a936..fe283f486b4239b4d1f73b5bee11bb200b209780 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -27,8 +27,8 @@ import os
 # The variables in this file are grouped by config_root, target_root.
 
 # variables used with config_root (these need to be relative)
-MAKE_CONF_FILE           = "etc/make.conf"
 USER_CONFIG_PATH         = "etc/portage"
+MAKE_CONF_FILE           = USER_CONFIG_PATH + "/make.conf"
 MODULES_FILE_PATH        = USER_CONFIG_PATH + "/modules"
 CUSTOM_PROFILE_PATH      = USER_CONFIG_PATH + "/profile"
 USER_VIRTUALS_FILE       = USER_CONFIG_PATH + "/virtuals"

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index d2f62acf6a88c9a9bfb2326fff5e766f901a5fc9..2a05904866e70fe133181b2231c3249181c4e919 100644 (file)
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -303,11 +303,11 @@ class config(object):
                        abs_user_config = locations_manager.abs_user_config
 
                        make_conf = getconfig(
-                               os.path.join(config_root, MAKE_CONF_FILE),
+                               os.path.join(config_root, 'etc', 'make.conf'),
                                tolerant=tolerant, allow_sourcing=True) or {}
 
                        make_conf.update(getconfig(
-                               os.path.join(abs_user_config, 'make.conf'),
+                               os.path.join(config_root, MAKE_CONF_FILE),
                                tolerant=tolerant, allow_sourcing=True,
                                expand=make_conf) or {})
 
@@ -482,12 +482,12 @@ class config(object):
                        self.configdict["defaults"]=self.configlist[-1]
 
                        mygcfg = getconfig(
-                               os.path.join(config_root, MAKE_CONF_FILE),
+                               os.path.join(config_root, 'etc', 'make.conf'),
                                tolerant=tolerant, allow_sourcing=True,
                                expand=expand_map) or {}
 
                        mygcfg.update(getconfig(
-                               os.path.join(abs_user_config, 'make.conf'),
+                               os.path.join(config_root, MAKE_CONF_FILE),
                                tolerant=tolerant, allow_sourcing=True,
                                expand=expand_map) or {})