Gentoo Archives: gentoo-catalyst

From: "M. J. Everitt" <m.j.everitt@×××.org>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH] Preclean fails attempting to Unmerge distcc when already depcleaned
Date: Sun, 09 Sep 2018 17:55:17
Message-Id: f9f64e42-be57-1186-e087-3cbbfff9df0b@iee.org
1 Better version than previous, suggested by Chewi - thanks!
2 ---
3 targets/stage3/stage3-preclean-chroot.sh | 5 ++++-
4 1 file changed, 4 insertions(+), 1 deletion(-)
5
6 diff --git a/targets/stage3/stage3-preclean-chroot.sh
7 b/targets/stage3/stage3-preclean-chroot.sh
8 index 027dedea..33a700a6 100755
9 --- a/targets/stage3/stage3-preclean-chroot.sh
10 +++ b/targets/stage3/stage3-preclean-chroot.sh
11 @@ -11,7 +11,10 @@ cleanup_stages
12 if [ -n "${clst_DISTCC}" ]
13 then
14 - run_merge -C sys-devel/distcc || exit 1
15 + portageq has_version / sys-devel/distcc
16 + if [ $? == 0 ]; then
17 + run_merge -C sys-devel/distcc || exit 1
18 + fi
19 fi
20 if [ -n "${clst_ICECREAM}" ]
21 --
22 2.13.0

Attachments

File name MIME type
signature.asc application/pgp-signature