From: Andrew Gaffney <agaffney@gentoo.org>
Date: Mon, 29 Oct 2007 19:47:23 +0000 (+0000)
Subject: check to see if distcc is enabled before calling cleanup_distcc()
X-Git-Tag: CATALYST_2_0_6_916~242
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9afb8028159eca70284b990ca4283c581364b9d3;p=catalyst.git

check to see if distcc is enabled before calling cleanup_distcc()

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1252 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/ChangeLog b/ChangeLog
index 071d9c25..9236f34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 Oct 2007; Andrew Gaffney <agaffney@gentoo.org>
+  targets/embedded/embedded-preclean-chroot.sh,
+  targets/grp/grp-preclean-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,
+  targets/stage2/stage2-preclean-chroot.sh,
+  targets/stage3/stage3-preclean-chroot.sh,
+  targets/tinderbox/tinderbox-preclean-chroot.sh:
+  check to see if distcc is enabled before calling cleanup_distcc()
+
   17 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> arch/ppc.py,
   arch/sparc.py, arch/x86.py:
   look for linux32 in /bin and /usr/bin
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
index 180ff418..b4da9cb2 100755
--- a/targets/embedded/embedded-preclean-chroot.sh
+++ b/targets/embedded/embedded-preclean-chroot.sh
@@ -3,4 +3,7 @@
 . /tmp/chroot-functions.sh
 update_env_settings
 
-cleanup_distcc
+if [ -n "${clst_DISTCC}" ]
+then
+	cleanup_distcc
+fi
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index 84ba6ad2..94b5bedf 100755
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -2,6 +2,10 @@
 
 . /tmp/chroot-functions.sh
 update_env_settings
-cleanup_distcc
+
+if [ -n "${clst_DISTCC}" ]
+then
+	cleanup_distcc
+fi
 
 gconftool-2 --shutdown
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
index 195cc62c..b4da9cb2 100755
--- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
@@ -2,4 +2,8 @@
 
 . /tmp/chroot-functions.sh
 update_env_settings
-cleanup_distcc
+
+if [ -n "${clst_DISTCC}" ]
+then
+	cleanup_distcc
+fi
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
index 326a148c..9ad8aecf 100755
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
@@ -12,8 +12,7 @@ fi
 if [ -n "${clst_DISTCC}" ]
 then
 	run_emerge -C sys-devel/distcc || exit 1
+	cleanup_distcc
 fi
 
-cleanup_distcc
-
 rm -f /var/log/emerge.log
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index 326a148c..9ad8aecf 100755
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -12,8 +12,7 @@ fi
 if [ -n "${clst_DISTCC}" ]
 then
 	run_emerge -C sys-devel/distcc || exit 1
+	cleanup_distcc
 fi
 
-cleanup_distcc
-
 rm -f /var/log/emerge.log
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
index 195cc62c..b4da9cb2 100755
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh
@@ -2,4 +2,8 @@
 
 . /tmp/chroot-functions.sh
 update_env_settings
-cleanup_distcc
+
+if [ -n "${clst_DISTCC}" ]
+then
+	cleanup_distcc
+fi