diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-08-11 14:51:35 +0100 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2019-08-13 18:29:38 -0700 |
| commit | f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 (patch) | |
| tree | 46fe19869aefe65728c913b3e4eb803f979e8a18 | |
| parent | dblink._collision_protect: Detect internal collisions. (diff) | |
| download | portage-f28d32f298d4b089a2e36bebca2a55b6aeabe2a3.tar.gz portage-f28d32f298d4b089a2e36bebca2a55b6aeabe2a3.tar.bz2 portage-f28d32f298d4b089a2e36bebca2a55b6aeabe2a3.zip | |
Allow ESYSROOT and BROOT in the pkg_setup phase
This follows a recent change to PMS.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | lib/portage/package/ebuild/config.py | 7 |
1 files 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 |