summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/config.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
commit96b053ac52fa37fdd61cbb76cb44dfb90fb49f86 (patch)
treeb1011e1b62a08e7b3da14bc097f60dbea72c830d /pym/portage/package/ebuild/config.py
parentea54077b59d2aec35add5c3f6779b6772f3127a5 (diff)
downloadportage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.gz
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.bz2
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.zip
Prefer /etc/portage/make.profile.v2.2.0_alpha126
This is the default location used by current versions of eselect profile, and will soon be the default location in stages. Since eselect profile generates a warning if both /etc/make.profile and /etc/portage/make.profile exist, the new default should be fairly safe (although eselect profile currently prefers /etc/make.profile when both exist).
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
-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 8f3b59bc9..ffebd22d1 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -958,7 +958,7 @@ class config(object):
if profile_broken:
abs_profile_path = None
- for x in (PROFILE_PATH, 'etc/portage/make.profile'):
+ for x in (PROFILE_PATH, 'etc/make.profile'):
x = os.path.join(self["PORTAGE_CONFIGROOT"], x)
try:
os.lstat(x)