From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 235AC139694 for ; Tue, 16 May 2017 17:21:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15C1C21C131; Tue, 16 May 2017 17:19:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6FC921C124 for ; Tue, 16 May 2017 17:19:36 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 6F4453416DB; Tue, 16 May 2017 17:19:35 +0000 (UTC) Message-ID: <1494955172.1591.5.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] distutils-r1.eclass: Namespace & doc _clean_egg_info From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Tue, 16 May 2017 19:19:32 +0200 In-Reply-To: <20170505212845.18868-1-mgorny@gentoo.org> References: <20170505212845.18868-1-mgorny@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-WYaZbDAWy9Of6t4ZllTl" X-Mailer: Evolution 3.22.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: df3620af-41de-451f-97c2-07145ea0cf58 X-Archives-Hash: 32155806a9a56aebdd1d6f57cf856a86 --=-WYaZbDAWy9Of6t4ZllTl Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On pi=C4=85, 2017-05-05 at 23:28 +0200, Micha=C5=82 G=C3=B3rny wrote: > Prefix the _clean_egg_info function with an appropriate namespace, > and document its purpose with eclassdoc format. Be more verbose > on the exact problem being solved; remove URL to old upstream bug > tracker that no longer exists. > --- > eclass/distutils-r1.eclass | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) >=20 > ** REVIEW NOTE ** >=20 > Do we still need this hack? Is there any chance the issue has been > fixed upstream? Can someone test it and find a bug upstream and/or > re-report it? >=20 > diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass > index 5df7234332d3..1376326c9579 100644 > --- a/eclass/distutils-r1.eclass > +++ b/eclass/distutils-r1.eclass > @@ -770,10 +770,14 @@ distutils-r1_src_compile() { > fi > } > =20 > -_clean_egg_info() { > - # Work around for setuptools test behavior (bug 534058). > - # https://bitbucket.org/pypa/setuptools/issue/292 > - rm -rf "${BUILD_DIR}"/lib/*.egg-info > +# @FUNCTION: _distutils-r1_clean_egg_info > +# @INTERNAL > +# @DESCRIPTION: > +# Clean up potential stray egg-info files left by setuptools test phase. > +# Those files ended up being unversioned, and caused issues: > +# https://bugs.gentoo.org/534058 > +_distutils-r1_clean_egg_info() { > + rm -rf "${BUILD_DIR}"/lib/*.egg-info || die > } > =20 > distutils-r1_src_test() { > @@ -781,7 +785,7 @@ distutils-r1_src_test() { > =20 > if declare -f python_test >/dev/null; then > _distutils-r1_run_foreach_impl python_test > - _distutils-r1_run_foreach_impl _clean_egg_info > + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info > fi > =20 > if declare -f python_test_all >/dev/null; then Committed. --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-WYaZbDAWy9Of6t4ZllTl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEXr8g+Zb7PCLMb8pAur8dX/jIEQoFAlkbNKRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDVF QkYyMEY5OTZGQjNDMjJDQzZGQ0E0MEJBQkYxRDVGRjhDODExMEEACgkQur8dX/jI EQpUIQ//WWwDtby7aneNjGTQRqmm/G84Bo1fyt+cMU/Gnp4qcvgUZy2fRlJ/UFUI /MVylh9Db/uz1LxbCWrcv690+VctHZjsz54Qaj+ebci6DrjDwboWLnADXACLNU84 4d0tdfkwWYlg88fEf7FRgP8N8S0hL+VWL1m0tJkD6ZQayLrLl9z3RZP1/jGxmJlO D99z46Y3etmslr5ELThgiG/fLBeOXS76Hqccj+OCD6zmWJfTvpzdnLG2X9+BxbVK WSm6heDtUGIjhyHH04aFWE3uwByPjyH9p/CWLl5NRGrKUr4tidoSyLbHgXYkRTnc VDtoMttPGRBxYBRsggmlqacqdPDK9cc1UlrYHYVEdmbmHwNkCLnSO6GyEOT+52ce C1t32YQUhamYs99zPl7yDazVnoCiT8KVTo1CED0UUEzzjxXRJPInF700YdOAcYlN KsiQ5c2WtKOkQgSU4+LROWxhc7JCTCio2FSQxJljRz+LA4OuCpAlkoqUjNNsdyXi oWfxb0ttD09FIhBD5asLv4o+xEmf/bTK5JTUUEhtnbwej61KLcCPxj+8p2XCER/F kojZSaYuX0pQU0GS4VXORPhRaGJJK2FCckmPM1ru4F5ROhiaHn4vvWNiEF8C6Myu VaRO/x2LuPAXibVYFdJIJQHIJi7l0QlWYx9vu7VDqaiCE2mdtHE= =z4A9 -----END PGP SIGNATURE----- --=-WYaZbDAWy9Of6t4ZllTl--