diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-19 19:56:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-19 19:56:41 -0700 |
| commit | 0b80286311ccc4fbbe9e13015541867f7235a3c9 (patch) | |
| tree | 507404c4533e9fc842426860177111ee812b5863 | |
| parent | c4a5a11080868abae6864e8fe6ab0ba2340ed51c (diff) | |
| download | portage-0b80286311ccc4fbbe9e13015541867f7235a3c9.tar.gz portage-0b80286311ccc4fbbe9e13015541867f7235a3c9.tar.bz2 portage-0b80286311ccc4fbbe9e13015541867f7235a3c9.zip | |
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.
| -rw-r--r-- | pym/portage/const.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 1ebfdc8ef..fe283f486 100644 --- 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 d2f62acf6..2a0590486 100644 --- 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 {}) |