1 |
Remove the EAPI condition for *.pth files, as they are banned in all |
2 |
EAPIs currently supported by the eclass. |
3 |
|
4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
5 |
--- |
6 |
eclass/distutils-r1.eclass | 24 +++++++++++------------- |
7 |
1 file changed, 11 insertions(+), 13 deletions(-) |
8 |
|
9 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
10 |
index d667b31191e2..5a622689b979 100644 |
11 |
--- a/eclass/distutils-r1.eclass |
12 |
+++ b/eclass/distutils-r1.eclass |
13 |
@@ -2023,21 +2023,19 @@ _distutils-r1_check_namespace_pth() { |
14 |
done < <(find "${ED%/}" -name '*-nspkg.pth' -print0) |
15 |
|
16 |
if [[ ${pth[@]} ]]; then |
17 |
- ewarn "The following *-nspkg.pth files were found installed:" |
18 |
- ewarn |
19 |
+ eerror "The following *-nspkg.pth files were found installed:" |
20 |
+ eerror |
21 |
for f in "${pth[@]}"; do |
22 |
- ewarn " ${f#${ED%/}}" |
23 |
+ eerror " ${f#${ED%/}}" |
24 |
done |
25 |
- ewarn |
26 |
- ewarn "The presence of those files may break namespaces in Python 3.5+. Please" |
27 |
- ewarn "read our documentation on reliable handling of namespaces and update" |
28 |
- ewarn "the ebuild accordingly:" |
29 |
- ewarn |
30 |
- ewarn " https://projects.gentoo.org/python/guide/concept.html#namespace-packages" |
31 |
- |
32 |
- if ! has "${EAPI}" 6 7 8; then |
33 |
- die "*-nspkg.pth files are banned in EAPI ${EAPI}" |
34 |
- fi |
35 |
+ eerror |
36 |
+ eerror "The presence of those files may break namespaces in Python 3.5+. Please" |
37 |
+ eerror "read our documentation on reliable handling of namespaces and update" |
38 |
+ eerror "the ebuild accordingly:" |
39 |
+ eerror |
40 |
+ eerror " https://projects.gentoo.org/python/guide/concept.html#namespace-packages" |
41 |
+ |
42 |
+ die "Installing *-nspkg.pth files is banned" |
43 |
fi |
44 |
} |
45 |
|
46 |
-- |
47 |
2.37.3 |