| 1 |
commit: 5dc5e3beadf3374eb3c2497e4597c6b44bdc7c70 |
| 2 |
Author: Michael Everitt <m.j.everitt <AT> iee <DOT> org> |
| 3 |
AuthorDate: Sun Sep 9 17:49:16 2018 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 1 16:17:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5dc5e3be |
| 7 |
|
| 8 |
Preclean fails attempting to Unmerge distcc when already depcleaned |
| 9 |
|
| 10 |
Suggested-By: James Le Cuirot <chewi <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/stage3/stage3-preclean-chroot.sh | 5 ++++- |
| 13 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh |
| 16 |
index 027dedea..33a700a6 100755 |
| 17 |
--- a/targets/stage3/stage3-preclean-chroot.sh |
| 18 |
+++ b/targets/stage3/stage3-preclean-chroot.sh |
| 19 |
@@ -11,7 +11,10 @@ cleanup_stages |
| 20 |
|
| 21 |
if [ -n "${clst_DISTCC}" ] |
| 22 |
then |
| 23 |
- run_merge -C sys-devel/distcc || exit 1 |
| 24 |
+ portageq has_version / sys-devel/distcc |
| 25 |
+ if [ $? == 0 ]; then |
| 26 |
+ run_merge -C sys-devel/distcc || exit 1 |
| 27 |
+ fi |
| 28 |
fi |
| 29 |
|
| 30 |
if [ -n "${clst_ICECREAM}" ] |
Archives