| 1 |
commit: cd7364fbbb048564c2714d8a08df1ecbdc9cfe6e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 20:27:59 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 3 20:33:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd7364fb |
| 7 |
|
| 8 |
special_env_vars: add ESYSROOT and SYSROOT to environ_whitelist |
| 9 |
|
| 10 |
Since these variables are filtered from the peristent ebuild environment |
| 11 |
by the __filter_readonly_variables function, they have to be whitelisted |
| 12 |
so that the config.environ() method allow them to pass through. |
| 13 |
|
| 14 |
Fixes: a41dacf7926c ("Export SYSROOT and ESYSROOT in ebuild env in EAPI 7") |
| 15 |
Reported-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 16 |
|
| 17 |
pym/portage/package/ebuild/_config/special_env_vars.py | 4 ++-- |
| 18 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py |
| 21 |
index 3323ff064..a308518af 100644 |
| 22 |
--- a/pym/portage/package/ebuild/_config/special_env_vars.py |
| 23 |
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py |
| 24 |
@@ -46,7 +46,7 @@ environ_whitelist += [ |
| 25 |
"DISTDIR", "DOC_SYMLINKS_DIR", "EAPI", "EBUILD", |
| 26 |
"EBUILD_FORCE_TEST", |
| 27 |
"EBUILD_PHASE", "EBUILD_PHASE_FUNC", "ECLASSDIR", "ECLASS_DEPTH", "ED", |
| 28 |
- "EMERGE_FROM", "EPREFIX", "EROOT", |
| 29 |
+ "EMERGE_FROM", "EPREFIX", "EROOT", "ESYSROOT", |
| 30 |
"FEATURES", "FILESDIR", "HOME", "MERGE_TYPE", "NOCOLOR", "PATH", |
| 31 |
"PKGDIR", |
| 32 |
"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR", |
| 33 |
@@ -77,7 +77,7 @@ environ_whitelist += [ |
| 34 |
"PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE", "PORTAGE_XATTR_EXCLUDE", |
| 35 |
"PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PYTHONDONTWRITEBYTECODE", |
| 36 |
"REPLACING_VERSIONS", "REPLACED_BY_VERSION", |
| 37 |
- "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", |
| 38 |
+ "ROOT", "ROOTPATH", "SYSROOT", "T", "TMP", "TMPDIR", |
| 39 |
"USE_EXPAND", "USE_ORDER", "WORKDIR", |
| 40 |
"XARGS", "__PORTAGE_TEST_HARDLINK_LOCKS", |
| 41 |
] |
Archives