aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2015-03-03 12:58:34 -0800
committerZac Medico <zmedico@gentoo.org>2015-03-03 13:25:42 -0800
commit20a48be6f4c6779e7d89aef2a64c008ec70dcc14 (patch)
treea32dc3975672719bc1353ec3dd534d82882bc35a
parentmain/emaint.1: Add entry about the merges module (diff)
downloadportage-20a48be6f4c6779e7d89aef2a64c008ec70dcc14.tar.gz
portage-20a48be6f4c6779e7d89aef2a64c008ec70dcc14.tar.bz2
portage-20a48be6f4c6779e7d89aef2a64c008ec70dcc14.zip
make.conf: expand PORTAGE_CONFIGROOT (bug 511806)
This can be useful for making settings, such as PKGDIR, relative to PORTAGE_CONFIGROOT. X-Gentoo-Bug: 511806 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511806 Acked-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--pym/portage/package/ebuild/config.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 71fe4dfda..3c0018f9e 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -394,6 +394,7 @@ class config(object):
# Allow make.globals to set default paths relative to ${EPREFIX}.
expand_map["EPREFIX"] = eprefix
+ expand_map["PORTAGE_CONFIGROOT"] = config_root
if portage._not_installed:
make_globals_path = os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals")