1 |
On pią, 2017-05-05 at 23:28 +0200, Michał Górny wrote: |
2 |
> Prefix the _clean_egg_info function with an appropriate namespace, |
3 |
> and document its purpose with eclassdoc format. Be more verbose |
4 |
> on the exact problem being solved; remove URL to old upstream bug |
5 |
> tracker that no longer exists. |
6 |
> --- |
7 |
> eclass/distutils-r1.eclass | 14 +++++++++----- |
8 |
> 1 file changed, 9 insertions(+), 5 deletions(-) |
9 |
> |
10 |
> ** REVIEW NOTE ** |
11 |
> |
12 |
> Do we still need this hack? Is there any chance the issue has been |
13 |
> fixed upstream? Can someone test it and find a bug upstream and/or |
14 |
> re-report it? |
15 |
> |
16 |
> diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
17 |
> index 5df7234332d3..1376326c9579 100644 |
18 |
> --- a/eclass/distutils-r1.eclass |
19 |
> +++ b/eclass/distutils-r1.eclass |
20 |
> @@ -770,10 +770,14 @@ distutils-r1_src_compile() { |
21 |
> fi |
22 |
> } |
23 |
> |
24 |
> -_clean_egg_info() { |
25 |
> - # Work around for setuptools test behavior (bug 534058). |
26 |
> - # https://bitbucket.org/pypa/setuptools/issue/292 |
27 |
> - rm -rf "${BUILD_DIR}"/lib/*.egg-info |
28 |
> +# @FUNCTION: _distutils-r1_clean_egg_info |
29 |
> +# @INTERNAL |
30 |
> +# @DESCRIPTION: |
31 |
> +# Clean up potential stray egg-info files left by setuptools test phase. |
32 |
> +# Those files ended up being unversioned, and caused issues: |
33 |
> +# https://bugs.gentoo.org/534058 |
34 |
> +_distutils-r1_clean_egg_info() { |
35 |
> + rm -rf "${BUILD_DIR}"/lib/*.egg-info || die |
36 |
> } |
37 |
> |
38 |
> distutils-r1_src_test() { |
39 |
> @@ -781,7 +785,7 @@ distutils-r1_src_test() { |
40 |
> |
41 |
> if declare -f python_test >/dev/null; then |
42 |
> _distutils-r1_run_foreach_impl python_test |
43 |
> - _distutils-r1_run_foreach_impl _clean_egg_info |
44 |
> + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info |
45 |
> fi |
46 |
> |
47 |
> if declare -f python_test_all >/dev/null; then |
48 |
|
49 |
Committed. |
50 |
|
51 |
-- |
52 |
Best regards, |
53 |
Michał Górny |