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 5B3A7138334 for ; Sun, 9 Sep 2018 17:55:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60CB2E09CB; Sun, 9 Sep 2018 17:55:16 +0000 (UTC) Received: from avasout05.plus.net (avasout05.plus.net [84.93.230.250]) (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 21934E09CB for ; Sun, 9 Sep 2018 17:55:15 +0000 (UTC) Received: from [192.168.6.147] ([212.159.46.162]) by smtp with ESMTP id z3vVfHpBW05ijz3vWfZy8u; Sun, 09 Sep 2018 18:55:14 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.3 cv=QJJGuDDL c=1 sm=1 tr=0 a=RuViaDnnNG9rfPLW4VJocg==:117 a=RuViaDnnNG9rfPLW4VJocg==:17 a=13zjGPudsaEWiJwPRgMA:9 a=4W5pqjW7Roa_LkgMd08A:9 a=pILNOxqGKmIA:10 a=PsH4QbO_CHj8WxGhF3wA:9 a=ONNS8QRKHyMA:10 From: "M. J. Everitt" Subject: [gentoo-catalyst] [PATCH] Preclean fails attempting to Unmerge distcc when already depcleaned To: gentoo-catalyst@lists.gentoo.org Openpgp: id=BA266E0525CFAB101523351B4C30334F93C22371 Autocrypt: addr=m.j.everitt@iee.org; prefer-encrypt=mutual; keydata= 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 nurTf8FtGwnuig== Message-ID: Date: Sun, 9 Sep 2018 18:55:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 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="gTu52cAvjBcmZqNJwU4cHlt2iPMbzDogM" X-CMAE-Envelope: MS4wfKKu7wsMuw4sEe4QFTLAH7MaI3/Zh/IFrNYxHhXWyHGggfZBROnRwzdqF3UjRR66tCqGSHiVKlFcZFVfaHP04TJue9VHbEmGeb4TKPnoE4ho6Hm8GNN7 4DR7CRQYXZfCpV+W2iapbE7FmmTZRkGJW5LOsz01F4uHR75hDIYgf7InghsZadL4S2qXXA3XJCPmBQ== X-Archives-Salt: 2f4c9264-435d-447a-810a-cb14710b76ac X-Archives-Hash: 124979fff0bf88a49eae9402d8380801 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gTu52cAvjBcmZqNJwU4cHlt2iPMbzDogM Content-Type: multipart/mixed; boundary="2ZIU8VS2OFl3gfB3ImZ0sBzHzZw25M2HT"; protected-headers="v1" From: "M. J. Everitt" To: gentoo-catalyst@lists.gentoo.org Message-ID: Subject: [PATCH] Preclean fails attempting to Unmerge distcc when already depcleaned --2ZIU8VS2OFl3gfB3ImZ0sBzHzZw25M2HT Content-Type: text/plain; charset=windows-1252 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable Better version than previous, suggested by Chewi - thanks! --- targets/stage3/stage3-preclean-chroot.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh index 027dedea..33a700a6 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -11,7 +11,10 @@ cleanup_stages if [ -n "${clst_DISTCC}" ] then - run_merge -C sys-devel/distcc || exit 1 + portageq has_version / sys-devel/distcc + if [ $? =3D=3D 0 ]; then + run_merge -C sys-devel/distcc || exit 1 + fi fi if [ -n "${clst_ICECREAM}" ] --=20 2.13.0 --2ZIU8VS2OFl3gfB3ImZ0sBzHzZw25M2HT-- --gTu52cAvjBcmZqNJwU4cHlt2iPMbzDogM 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 iQIcBAEBCAAGBQJblV6BAAoJEGPnxnn01DHdyEgP/jpxvPNa7fS/Q24SZXPfer2I YMb1GIXNE+crzf0Jq5cAXGk31vQ4KuDc2yPck9FMrVJNgoq2K9M1mwtmM0YWKJYB Mt1vbtQNZHFmDQjbamKo8kCV8huT4Osel75kwvl0czv9B6qd8fWDxrFVDjGoHNrS Z0U46KAphYWbc9RCauT7kQx7mvjLeFbcoah++APk3kQxm0vTMjKcCVCihEGks3Q6 tS+/TNc1X7oXZcV73kKU/SK4laFmDnNxDVvglR9ZLJGgrPRJxUAIEBRh2sfJ85mc Pdc81nUXIsQEvzH8Kq/MKZX77QojL6RTpMnqRvyylJSGJ+fgo1UMlTkKob8yCV1a ZQSKNYbb+v0wEdlECFp0T7ZX2DBASoLLfdzB5nl3cud110CKl1ZUX645554BD1Vb 0d3M9MXl3EVb3JWGaCxxlW4SQUtVEQbVn86Pn4/0Yzp47e4p70wxxW58aL+UsNPL sKGRDXkKhJPnheaaUYXCkEnHgiyPbQaiBapk30sXWupG3zABzVVdXp2qaAzIEOl1 iYhylC+vGgK9cuuUAUsydv6FRLftPQdFGMxgLpNYkFVmNgzI33AaHrc0NrgC5wt6 dmmERfoQV1xZykw3GIkMT5CWzaZUuNSv8ckLHoPtbpQdiicgRVfdPZDFkKvSc/Rs uB32RdopOC4rTPwGS+1N =u7ye -----END PGP SIGNATURE----- --gTu52cAvjBcmZqNJwU4cHlt2iPMbzDogM--