1 |
On Sat, Jul 25, 2015 at 12:37:43PM +0200, Michał Górny wrote: |
2 |
> Ban calling python3{,-config} when python2 is used, and the other way |
3 |
> around. While this will not prevent configure scripts from finding the |
4 |
> other Python version, it will cause them to fail eventually trying to |
5 |
> use it. Currently those attempt were able to pass through thanks to |
6 |
> python-config providing python{2,3} symlinks. |
7 |
|
8 |
you mean eselect providing. |
9 |
|
10 |
> --- |
11 |
> eclass/python-utils-r1.eclass | 6 ++++-- |
12 |
> 1 file changed, 4 insertions(+), 2 deletions(-) |
13 |
> |
14 |
> diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
15 |
> index 69d3262..2584f3e 100644 |
16 |
> --- a/eclass/python-utils-r1.eclass |
17 |
> +++ b/eclass/python-utils-r1.eclass |
18 |
> @@ -847,11 +847,13 @@ python_wrapper_setup() { |
19 |
> local EPYTHON PYTHON |
20 |
> python_export "${impl}" EPYTHON PYTHON |
21 |
> |
22 |
> - local pyver |
23 |
> + local pyver pyother |
24 |
> if python_is_python3; then |
25 |
> pyver=3 |
26 |
> + pyother=2 |
27 |
> else |
28 |
> pyver=2 |
29 |
> + pyother=3 |
30 |
> fi |
31 |
> |
32 |
> # Python interpreter |
33 |
> @@ -865,7 +867,7 @@ python_wrapper_setup() { |
34 |
> cp "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die |
35 |
> chmod +x "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die |
36 |
> |
37 |
> - local nonsupp=() |
38 |
> + local nonsupp=( "python${pyother}" "python${pyother}-config" ) |
39 |
|
40 |
I have had basically this exact patch locally for a few days since we |
41 |
talked about it and it hasnt been a problem yet but is not very much |
42 |
testing. I was wondering if perhaps this should be a qawarn for a while |
43 |
first instead of banning immediately? |
44 |
|
45 |
> # CPython-specific |
46 |
> if [[ ${EPYTHON} == python* ]]; then |
47 |
> -- |
48 |
> 2.4.6 |