1 |
On Wed, Aug 21, 2013 at 6:43 AM, Michał Górny <mgorny@g.o> wrote: |
2 |
> --- |
3 |
> gx86/eclass/distutils-r1.eclass | 4 ++-- |
4 |
> 1 file changed, 2 insertions(+), 2 deletions(-) |
5 |
> |
6 |
> diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass |
7 |
> index 81e5824..97ddbe4 100644 |
8 |
> --- a/gx86/eclass/distutils-r1.eclass |
9 |
> +++ b/gx86/eclass/distutils-r1.eclass |
10 |
> @@ -308,7 +308,7 @@ distutils_install_for_testing() { |
11 |
> esetup.py "${add_args[@]}" |
12 |
> } |
13 |
> |
14 |
> -_disable_ez_setup() { |
15 |
> +_distutils-r1_disable_ez_setup() { |
16 |
> local stub="def use_setuptools(*args, **kwargs): pass" |
17 |
> [[ -f ez_setup.py ]] && echo "${stub}" > ez_setup.py |
18 |
> [[ -f distribute_setup.py ]] && echo "${stub}" > distribute_setup.py |
19 |
> @@ -337,7 +337,7 @@ distutils-r1_python_prepare_all() { |
20 |
> fi |
21 |
> |
22 |
> # Prevent packages from downloading their own copy of setuptools |
23 |
> - _disable_ez_setup |
24 |
> + _distutils-r1_disable_ez_setup |
25 |
> |
26 |
> if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]] |
27 |
> then |
28 |
> -- |
29 |
> 1.8.3.2 |
30 |
> |
31 |
> |
32 |
|
33 |
LGTM |