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