1 |
On 8/11/19 6:51 AM, James Le Cuirot wrote: |
2 |
> From: Michał Górny <mgorny@g.o> |
3 |
> |
4 |
> This follows a recent change to PMS. |
5 |
> |
6 |
> Signed-off-by: James Le Cuirot <chewi@g.o> |
7 |
> --- |
8 |
> lib/portage/package/ebuild/config.py | 7 ++++--- |
9 |
> 1 file changed, 4 insertions(+), 3 deletions(-) |
10 |
> |
11 |
> Sending this on behalf of mgorny as requested. |
12 |
> |
13 |
> diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py |
14 |
> index 83a15b370..e0dda54d4 100644 |
15 |
> --- a/lib/portage/package/ebuild/config.py |
16 |
> +++ b/lib/portage/package/ebuild/config.py |
17 |
> @@ -2820,12 +2820,13 @@ class config(object): |
18 |
> if not eapi_exports_merge_type(eapi): |
19 |
> mydict.pop("MERGE_TYPE", None) |
20 |
> |
21 |
> - src_phase = _phase_func_map.get(phase, '').startswith('src_') |
22 |
> + src_like_phase = (phase == 'setup' or |
23 |
> + _phase_func_map.get(phase, '').startswith('src_')) |
24 |
> |
25 |
> - if not (src_phase and eapi_attrs.sysroot): |
26 |
> + if not (src_like_phase and eapi_attrs.sysroot): |
27 |
> mydict.pop("ESYSROOT", None) |
28 |
> |
29 |
> - if not (src_phase and eapi_attrs.broot): |
30 |
> + if not (src_like_phase and eapi_attrs.broot): |
31 |
> mydict.pop("BROOT", None) |
32 |
> |
33 |
> # Prefix variables are supported beginning with EAPI 3, or when |
34 |
> |
35 |
|
36 |
Thanks, merged: |
37 |
|
38 |
https://gitweb.gentoo.org/proj/portage.git/commit/?id=f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 |
39 |
-- |
40 |
Thanks, |
41 |
Zac |