public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: "M. J. Everitt" <m.j.everitt@iee.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] RFC: [PATCH]: Test for presence of distcc before preclean to avoid failure
Date: Wed, 24 Jan 2018 00:13:12 +0000	[thread overview]
Message-ID: <f361fc63-baf4-bdb3-fbe2-448a5926cd78@iee.org> (raw)


[-- Attachment #1.1.1: Type: text/plain, Size: 612 bytes --]

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.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 001-stage3-preclean-test-for-distcc.patch --]
[-- Type: text/x-patch; name="001-stage3-preclean-test-for-distcc.patch", Size: 519 bytes --]

diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-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
 
 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 [ $? == 0 ]; then
+		run_merge -C sys-devel/distcc || exit 1
+	fi
 fi
 
 if [ -n "${clst_ICECREAM}" ]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2018-01-24  0:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-24  0:13 M. J. Everitt [this message]
2018-01-24  3:45 ` [gentoo-catalyst] RFC: [PATCH]: Test for presence of distcc before preclean to avoid failure Mike Frysinger
2018-01-24  9:28   ` M. J. Everitt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f361fc63-baf4-bdb3-fbe2-448a5926cd78@iee.org \
    --to=m.j.everitt@iee.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox