summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-15 19:25:32 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-15 19:25:32 -0700
commitf15c724e6ea494c21e57289b0361614b6656ac35 (patch)
tree0eef93f47c922e56a8973e398f163f7090cd6551 /pym
parentd493a029add855e6ade95d60b57ec7b8f5aba067 (diff)
downloadportage-f15c724e6ea494c21e57289b0361614b6656ac35.tar.gz
portage-f15c724e6ea494c21e57289b0361614b6656ac35.tar.bz2
portage-f15c724e6ea494c21e57289b0361614b6656ac35.zip
Add support for /etc/portage/make.profile as an alternative to
/etc/make.profile. If both /etc/make.profile/ and /etc/portage/make.profile/ exist, then /etc/make.profile/ will be preferred.
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/package/ebuild/config.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index d01f7aeab..27cd85470 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -457,7 +457,12 @@ class config(object):
if os.path.isdir(config_profile_path):
self.profile_path = config_profile_path
else:
- self.profile_path = None
+ config_profile_path = \
+ os.path.join(abs_user_config, 'make.profile')
+ if os.path.isdir(config_profile_path):
+ self.profile_path = config_profile_path
+ else:
+ self.profile_path = None
else:
self.profile_path = config_profile_path