1 |
[I would like to push this along with the changeset 'mostly removing' |
2 |
py2.7 support] |
3 |
|
4 |
Switch the default distutils_install_for_testing behavior to --via-root |
5 |
(from legacy --via-home). The old versions of setuptools where |
6 |
--via-home worked are gone, and testing has so far proven that |
7 |
--via-root in the worst case leaves package as broken as before. |
8 |
|
9 |
Signed-off-by: Michał Górny <mgorny@g.o> |
10 |
--- |
11 |
eclass/distutils-r1.eclass | 14 +++++++------- |
12 |
1 file changed, 7 insertions(+), 7 deletions(-) |
13 |
|
14 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
15 |
index 5ffc91be479c..773806e32d93 100644 |
16 |
--- a/eclass/distutils-r1.eclass |
17 |
+++ b/eclass/distutils-r1.eclass |
18 |
@@ -1,4 +1,4 @@ |
19 |
-# Copyright 1999-2020 Gentoo Authors |
20 |
+# Copyright 1999-2021 Gentoo Authors |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
# @ECLASS: distutils-r1.eclass |
24 |
@@ -547,11 +547,11 @@ esetup.py() { |
25 |
# For most of the packages, tests built in BUILD_DIR are good enough. |
26 |
# |
27 |
# The function supports two install modes. The current default is |
28 |
-# the legacy --via-home mode. However, it has problems with newer |
29 |
-# versions of setuptools (50.3.0+). The --via-root mode generally |
30 |
-# works for these packages, and it will probably become the default |
31 |
-# in the future, once we test all affected packages. Please note |
32 |
-# that proper testing sometimes requires unmerging the package first. |
33 |
+# --via-root mode. Previously, the function defaulted to --via-home |
34 |
+# mode but it has been broken by new versions of setuptools (50.3.0+). |
35 |
+# If you find that --via-root does not work but --via-home does, please |
36 |
+# file a bug to let us know. Please note that proper testing sometimes |
37 |
+# requires unmerging the package first. |
38 |
distutils_install_for_testing() { |
39 |
debug-print-function ${FUNCNAME} "${@}" |
40 |
|
41 |
@@ -572,7 +572,7 @@ distutils_install_for_testing() { |
42 |
PATH=${bindir}:${PATH} |
43 |
PYTHONPATH=${libdir}:${PYTHONPATH} |
44 |
|
45 |
- local install_method=home |
46 |
+ local install_method=root |
47 |
case ${1} in |
48 |
--via-home) |
49 |
install_method=home |
50 |
-- |
51 |
2.30.0 |