[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage4/

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage4/

[Brian Dolbec]

commit:     e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 01:46:06 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 01:46:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ee4a51

use the cleanup_stage function instead of manual cleanup for stage4, do not wipe log directories for tinderbox

 targets/stage4/stage4-preclean-chroot.sh | 10 +---------
 targets/support/chroot-functions.sh      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e894..a22b6c1 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -7,12 +7,4 @@ source /tmp/chroot-functions.sh
 update_env_settings
 show_debug
 
-if [ -n "${clst_DISTCC}" ]
-then
-	cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
-	cleanup_icecream
-fi
+cleanup_stages

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
 	# Remove bindist from use
 	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-	rm -f /var/log/emerge.log /var/log/portage/elog/*
+	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
 update_env_settings(){