1 |
Replace the existing EPYTHON check with _python_check_EPYTHON and use |
2 |
_python_check_EPYTHON in a few additional places. |
3 |
|
4 |
Signed-off-by: Florian Schmaus <flow@g.o> |
5 |
--- |
6 |
eclass/distutils-r1.eclass | 8 +++++++- |
7 |
1 file changed, 7 insertions(+), 1 deletion(-) |
8 |
|
9 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
10 |
index 786f59636638..1326809a8bc1 100644 |
11 |
--- a/eclass/distutils-r1.eclass |
12 |
+++ b/eclass/distutils-r1.eclass |
13 |
@@ -460,7 +460,7 @@ distutils_enable_tests() { |
14 |
esetup.py() { |
15 |
debug-print-function ${FUNCNAME} "${@}" |
16 |
|
17 |
- [[ -n ${EPYTHON} ]] || die "EPYTHON unset, invalid call context" |
18 |
+ _python_check_EPYTHON |
19 |
|
20 |
[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg |
21 |
|
22 |
@@ -743,6 +743,8 @@ _distutils-r1_copy_egg_info() { |
23 |
distutils-r1_python_compile() { |
24 |
debug-print-function ${FUNCNAME} "${@}" |
25 |
|
26 |
+ _python_check_EPYTHON |
27 |
+ |
28 |
_distutils-r1_copy_egg_info |
29 |
|
30 |
# distutils is parallel-capable since py3.5 |
31 |
@@ -821,6 +823,8 @@ distutils-r1_python_test() { |
32 |
die "${FUNCNAME} can be only used after calling distutils_enable_tests" |
33 |
fi |
34 |
|
35 |
+ _python_check_EPYTHON |
36 |
+ |
37 |
if [[ ${_DISTUTILS_TEST_INSTALL} ]]; then |
38 |
distutils_install_for_testing |
39 |
fi |
40 |
@@ -860,6 +864,8 @@ distutils-r1_python_test() { |
41 |
distutils-r1_python_install() { |
42 |
debug-print-function ${FUNCNAME} "${@}" |
43 |
|
44 |
+ _python_check_EPYTHON |
45 |
+ |
46 |
local root=${D%/}/_${EPYTHON} |
47 |
[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} |
48 |
|
49 |
-- |
50 |
2.32.0 |