| 1 |
commit: 20a48be6f4c6779e7d89aef2a64c008ec70dcc14 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 3 20:58:34 2015 +0000 |
| 4 |
Commit: git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 3 21:25:42 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=20a48be6 |
| 7 |
|
| 8 |
make.conf: expand PORTAGE_CONFIGROOT (bug 511806) |
| 9 |
|
| 10 |
This can be useful for making settings, such as PKGDIR, relative |
| 11 |
to PORTAGE_CONFIGROOT. |
| 12 |
|
| 13 |
X-Gentoo-Bug: 511806 |
| 14 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511806 |
| 15 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
pym/portage/package/ebuild/config.py | 1 + |
| 18 |
1 file changed, 1 insertion(+) |
| 19 |
|
| 20 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 21 |
index 71fe4df..3c0018f 100644 |
| 22 |
--- a/pym/portage/package/ebuild/config.py |
| 23 |
+++ b/pym/portage/package/ebuild/config.py |
| 24 |
@@ -394,6 +394,7 @@ class config(object): |
| 25 |
|
| 26 |
# Allow make.globals to set default paths relative to ${EPREFIX}. |
| 27 |
expand_map["EPREFIX"] = eprefix |
| 28 |
+ expand_map["PORTAGE_CONFIGROOT"] = config_root |
| 29 |
|
| 30 |
if portage._not_installed: |
| 31 |
make_globals_path = os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals") |
Archives