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 2B1AE1382C5 for ; Wed, 24 Jan 2018 00:13:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 409C9E099C; Wed, 24 Jan 2018 00:13:29 +0000 (UTC) Received: from avasout06.plus.net (avasout06.plus.net [212.159.14.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E16D7E099C for ; Wed, 24 Jan 2018 00:13:28 +0000 (UTC) Received: from [192.168.6.147] ([212.159.46.162]) by smtp with ESMTP id e8gueBsMOc34Le8gweI33o; Wed, 24 Jan 2018 00:13:27 +0000 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.3 cv=ONIJIxSB c=1 sm=1 tr=0 a=RuViaDnnNG9rfPLW4VJocg==:117 a=RuViaDnnNG9rfPLW4VJocg==:17 a=13zjGPudsaEWiJwPRgMA:9 a=r77TgQKjGQsHNAKrUKIA:9 a=3vVAE01Ve-zERHEE2cwA:9 a=QEXdDO2ut3YA:10 a=GbrVEpOTGZKFsXhQveoA:9 a=CdiWusdWvyIA:10 a=LSk-Jj13hedq-l1g9XMA:9 a=ONNS8QRKHyMA:10 From: "M. J. Everitt" Subject: [gentoo-catalyst] RFC: [PATCH]: Test for presence of distcc before preclean to avoid failure To: gentoo-catalyst@lists.gentoo.org Openpgp: id=BA266E0525CFAB101523351B4C30334F93C22371 Message-ID: Date: Wed, 24 Jan 2018 00:13:12 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AEDI6n7iLqusbDJT2eHqJ0hMCuGj3DTre" X-CMAE-Envelope: MS4wfGZWeRzP2Y3r+i38pb/7uQ3/jxiJd3ZpkRpeDMr8XzqVduAsbX2xaJ7IdSrwR6MnN22qJ9tGdVyrE9ayGmMM3XpzfqMDri81XmjAgihqFlajZzYLPEt/ oiqJ76Aq7jHSuh/wpVzEEKeWVemea0MnpAFEdnf+8V0WmiNfUWVI5grx4ImfjJmBQRUuzJ5o5plVtw== X-Archives-Salt: fbd9abf5-29c6-48f7-b347-a45c33f6c35f X-Archives-Hash: 4b4e8fad64bda1c6a269ab44826331ef This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AEDI6n7iLqusbDJT2eHqJ0hMCuGj3DTre Content-Type: multipart/mixed; boundary="kcl9DhljI2A2Lj5QRh6Ncp810ct0Xs6PT"; protected-headers="v1" From: "M. J. Everitt" To: gentoo-catalyst@lists.gentoo.org Message-ID: Subject: RFC: [PATCH]: Test for presence of distcc before preclean to avoid failure --kcl9DhljI2A2Lj5QRh6Ncp810ct0Xs6PT Content-Type: multipart/mixed; boundary="------------D01E2B0A51D90F5B411E4200" This is a multi-part message in MIME format. --------------D01E2B0A51D90F5B411E4200 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable It would appear that the clean_stages function manages to successfully remove distcc before the clean_distcc and subsequent functions are called in stage3_preclean_chroot.sh, so the final 'emerge -C distcc' fails because the package is no longer installed. This patch tests for the existence of distcc before attempting an Unmerge. This may not be the cleanest/best method of doing this, and doesn't account presently for the failure of portageq or grep, but otherwise it has been tested on my imx6 armv7a using distcc to my x86_64 crossdev box(es). Ack to Zac for the suggestion. Regards, Michael. --------------D01E2B0A51D90F5B411E4200 Content-Type: text/x-patch; name="001-stage3-preclean-test-for-distcc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="001-stage3-preclean-test-for-distcc.patch" diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/st= age3-preclean-chroot.sh index 027dedea..324be17d 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -11,7 +11,10 @@ cleanup_stages =20 if [ -n "${clst_DISTCC}" ] then - run_merge -C sys-devel/distcc || exit 1 + portageq match / sys-devel/distcc 2>&1 | grep -s -q distcc + if [ $? =3D=3D 0 ]; then + run_merge -C sys-devel/distcc || exit 1 + fi fi =20 if [ -n "${clst_ICECREAM}" ] --------------D01E2B0A51D90F5B411E4200-- --kcl9DhljI2A2Lj5QRh6Ncp810ct0Xs6PT-- --AEDI6n7iLqusbDJT2eHqJ0hMCuGj3DTre Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJaZ8+kAAoJEGPnxnn01DHdcWUQALf1E3KJDciuvDhKEH7Y8Tga dia+84T37Nuf7EADLHMD7eUWPbF+BpcOJOLnyto3ewoPQmcddinBX1kvoeC9IocS 6tM4hYTNG0rnJp6ACRB/6gSliRRcSsVnL+ytFb6TpHuKkJYSMKSlWHPcHsISqZv5 WRw0qmbjCbihYrgpkbeFVZQAESBM6YLESKZ6GUWvBF7HGFja2KJccDHHOzSBemlR JE4qpODuRwoXIb/t4SRUy0p/1MKsFFht5t+kFuNs4nqZ/vVAp7VDbaHckPESwc74 HoDmh2kavCOhuUCg3POX29cY+J7/NUt9QzKbtsagaqUdeg1nhz88DTHmjv7B+AAq m7+aZkV8t1pCEccHTZ5q6Gg0I7xNI95TJmjsSIRZi5ghpSjiEbh/htdBwz9dg8Iy QyM+9pCdy8jNglaywI5QLAxgRzi9EY9dT1qExFVkSYEryUdERt8OoRu5ClEAeODH xMm6lm4QvjVC7tkRdUOu+ezv5l/FMhP7QDipLar+1rAZY34q+9Mu0oqI7GCq3QLz fvsXrT6CSCu9m01/rhW5SAN8K6HNXn3tnKQlMQxNMfET4HqciXrAzFM6Yh+zLDB0 uas+pBy0xQv5FtUukcgAf2dVJqmZjHKobrIhlk9llTmMmUk0Kig3qhtwAvExolG9 K0Opgj938Pv8eFTNE8gc =7G/o -----END PGP SIGNATURE----- --AEDI6n7iLqusbDJT2eHqJ0hMCuGj3DTre--