| 1 |
commit: e46b7fd568352311ab6b03a7cc38b891ee561e36 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 23 09:29:37 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 00:06:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46b7fd5 |
| 7 |
|
| 8 |
distutils-r1.eclass: Switch dift default to --via-root |
| 9 |
|
| 10 |
Switch the default distutils_install_for_testing behavior to --via-root |
| 11 |
(from legacy --via-home). The old versions of setuptools where |
| 12 |
--via-home worked are gone, and testing has so far proven that |
| 13 |
--via-root in the worst case leaves package as broken as before. |
| 14 |
|
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
eclass/distutils-r1.eclass | 12 ++++++------ |
| 18 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 21 |
index c5c954f4925..07ded8516fd 100644 |
| 22 |
--- a/eclass/distutils-r1.eclass |
| 23 |
+++ b/eclass/distutils-r1.eclass |
| 24 |
@@ -550,11 +550,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 |
@@ -575,7 +575,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 |
Archives