On 8/11/19 6:51 AM, James Le Cuirot wrote:
> From: Michał Górny <mgo...@gentoo.org>
>
> This follows a recent change to PMS.
>
> Signed-off-by: James Le Cuirot <ch...@gentoo.org>
> ---
> lib/portage/package/ebuild/config.py | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> Sending this on behalf of mgorny as requested.
>
> 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
> Thanks, merged: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 -- Thanks, Zac
signature.asc
Description: OpenPGP digital signature
