From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BC5D31381F3 for ; Sun, 15 Sep 2013 09:04:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5955AE09C4; Sun, 15 Sep 2013 09:04:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0936E09C4 for ; Sun, 15 Sep 2013 09:04:30 +0000 (UTC) Received: from localhost (77-255-12-39.adsl.inetia.pl [77.255.12.39]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 88DC833EB9E; Sun, 15 Sep 2013 09:04:28 +0000 (UTC) Date: Sun, 15 Sep 2013 11:04:31 +0200 From: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= To: Mike Gilbert Cc: gentoo-python , Gentoo Python Project Subject: Re: [gentoo-python] Re: [PATCH 5/8] distutils-r1: disable sub-root merging. Message-ID: <20130915110431.324d1925@gentoo.org> In-Reply-To: References: <1379098729-2801-1-git-send-email-mgorny@gentoo.org> <1379098729-2801-6-git-send-email-mgorny@gentoo.org> <20130915003852.3f989dab@gentoo.org> Organization: Gentoo X-Mailer: Claws Mail 3.9.2-dirty (GTK+ 2.24.20; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Discussions centering around the Python ecosystem in Gentoo Linux X-BeenThere: gentoo-python@gentoo.org X-BeenThere: gentoo-python@lists.gentoo.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA512; boundary="Sig_/SQ+dHnB8oDvmYfMqSUq4+j5"; protocol="application/pgp-signature" X-Archives-Salt: 03e578c2-d63f-4eff-82b8-6df953e86bee X-Archives-Hash: 9cb434c6859950d607f66e58a11ec896 --Sig_/SQ+dHnB8oDvmYfMqSUq4+j5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Dnia 2013-09-14, o godz. 19:33:04 Mike Gilbert napisa=C5=82(a): > On Sat, Sep 14, 2013 at 6:38 PM, Micha=C5=82 G=C3=B3rny wrote: > > Dnia 2013-09-14, o godz. 18:16:33 > > Mike Gilbert napisa=C5=82(a): > > > >> On Fri, Sep 13, 2013 at 2:58 PM, Micha=C5=82 G=C3=B3rny wrote: > >> > The sub-roots are no longer necessary since we're installing scripts= to > >> > per-impl directories initially. > >> > --- > >> > gx86/eclass/distutils-r1.eclass | 9 +++------ > >> > 1 file changed, 3 insertions(+), 6 deletions(-) > >> > > >> > diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils= -r1.eclass > >> > index 7102c58..5fcb55e 100644 > >> > --- a/gx86/eclass/distutils-r1.eclass > >> > +++ b/gx86/eclass/distutils-r1.eclass > >> > @@ -476,9 +476,7 @@ distutils-r1_python_install() { > >> > addpredict "$(python_get_sitedir)" > >> > addpredict /usr/lib/portage/pym > >> > > >> > - local root=3D${D}/_${EPYTHON} > >> > - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=3D${D} > >> > - flags+=3D( --root=3D"${root}" ) > >> > + flags+=3D( --root=3D"${D}" ) > >> > > >> > if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then > >> > local PYTHON_SCRIPTDIR > >> > @@ -488,13 +486,12 @@ distutils-r1_python_install() { > >> > > >> > esetup.py install "${flags[@]}" "${@}" > >> > > >> > - if [[ -d ${root}$(python_get_sitedir)/tests ]]; then > >> > + if [[ -d ${D}$(python_get_sitedir)/tests ]]; then > >> > die "Package installs 'tests' package, file collisio= ns likely." > >> > fi > >> > > >> > if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then > >> > - _distutils-r1_wrap_scripts "${root}" > >> > - multibuild_merge_root "${root}" "${D}" > >> > + _distutils-r1_wrap_scripts "${D}" > >> > fi > >> > } > >> > > >> > -- > >> > 1.8.3.2 > >> > > >> > >> I believe this patch causes a race condition which causes > >> java-config's ebuild to fail. > >> > >> running install_data > >> running install_egg_info > >> Writing /tmp/portage/dev-java/java-config-2.2.0/image/usr/lib64/python= 2.7/site-packages/java_config- > >> 2.2.0-py2.7.egg-info > >> error: /tmp/portage/dev-java/java-config-2.2.0/image//usr/share/java-c= onfig-2/config/: > >> File exists > > > > I love when people hack build systems and have no idea about writing > > build systems... > > > > What are you suggesting? Finding all the broken stuff and fixing it, or > > restoring sub-roots? >=20 > This is a well-used package which will be broken if we apply this > patch. I'm not sure we can reliably identify this kind of problem, and > fixing individual packages would be a bit of work in any case.. > Keeping the sub-roots code in place seems like the safer course of > action here. You're right. Replaced 5-8 with two smaller patches and submitted in a new sub-thread here. You can also find it in -r4 branch. --=20 Best regards, Micha=C5=82 G=C3=B3rny --Sig_/SQ+dHnB8oDvmYfMqSUq4+j5 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) iQJ8BAEBCgBmBQJSNXgiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyRgP/3mPAsfbgsH+GcgxBXZgxgAP KLMtORoBpgwIVBkwZrCexC1GDG2nS4YFcMkB0mEHK68x6Q3vU/9O5sVgYxn0PbzG rwMJlfObMZbAgqfdbSxxuexwpmTGa/DHUMprRFbmJrDCLnjrqokCUcU5OeeXt4X2 0kVldhrBKAVWdXIUnJ8lC/AmDRG9cEVAeYlV7GGZq5sDGSpQiiuzp9nSLbQ7njmP vPG/orymPtmoO7nWW44GLrTmza42RqfGreMlvVHn9ui1UZTfrlufwwRUkSPP/Gmi ShGi6r26Xk9hNYahk9IyGhFjtvnsp0nlsx9eYC5cI/vygB3z3lM/42nyfYYDHX9W RvLrR+PHDrKaKUL/TQjAk1S2k2JZ15/qpgjbUrRio37cneGjbq6em+xKRcF0/1T9 0ll5waFv7qdtR+VFsJHgfeUnwOL2lw7SGnLggxl3bi0MENdfHZCPAMDVMtlKS6Oe /lcH50CHhNDSBHyb7gtCggoShmxC+TsT/4XmdtsX7/UcU2WnuWmu1LlODtWqA7EQ l0dMBNKGDr2W7zsimvoO4E8yyXfz9jqwz06lR2hYhFLmIxkMYDGRz48FVhGYyw0l XgQLROgD1C77wK3uM1Cy7sGZq5od4eB/qx5+C56wHYgZjEUwRMPUCruQZdISaBAQ MWIidTmntmMiC5ZW3EnC =V7sP -----END PGP SIGNATURE----- --Sig_/SQ+dHnB8oDvmYfMqSUq4+j5--