commit: 5dc5e3beadf3374eb3c2497e4597c6b44bdc7c70
Author: Michael Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Sun Sep 9 17:49:16 2018 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 16:17:50 2018 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5dc5e3be
Preclean fails attempting to Unmerge distcc when already depcleaned
Suggested-By: James Le Cuirot <chewi <AT> gentoo.org>
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 [ $? == 0 ]; then
+ run_merge -C sys-devel/distcc || exit 1
+ fi
fi
if [ -n "${clst_ICECREAM}" ]
