commit: f28d32f298d4b089a2e36bebca2a55b6aeabe2a3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 13:51:35 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 01:29:38 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f28d32f2
Allow ESYSROOT and BROOT in the pkg_setup phase
This follows a recent change to PMS.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/package/ebuild/config.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index 83a15b370..e0dda54d4 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2820,12 +2820,13 @@ class config(object):
if not eapi_exports_merge_type(eapi):
mydict.pop("MERGE_TYPE", None)
- src_phase = _phase_func_map.get(phase, '').startswith('src_')
+ src_like_phase = (phase == 'setup' or
+ _phase_func_map.get(phase,
'').startswith('src_'))
- if not (src_phase and eapi_attrs.sysroot):
+ if not (src_like_phase and eapi_attrs.sysroot):
mydict.pop("ESYSROOT", None)
- if not (src_phase and eapi_attrs.broot):
+ if not (src_like_phase and eapi_attrs.broot):
mydict.pop("BROOT", None)
# Prefix variables are supported beginning with EAPI 3, or when
