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 071d9c2566c600569e4d2c2697c5954368ae86fa..9236f34d8eab28f41bc889b7ab2fe731e8fee818 100644 (file)
--- 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 180ff418c681412616b4ba25c53d53e1df4eb79e..b4da9cb25fdabd4ff5b9eb40eb723f52f780664e 100755 (executable)
--- 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 84ba6ad265b252b4a742cf2067ad2bff5f495ded..94b5bedf29af57bbd01c0dd60961e13be0e0ca57 100755 (executable)
--- 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 195cc62c9bdc33876b51da8096e939308ab3b9f0..b4da9cb25fdabd4ff5b9eb40eb723f52f780664e 100755 (executable)
--- 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 326a148c9ea62d33621b1c49b0806e274b8e24a9..9ad8aecf3212e5663347cf0b1a5bd78015994b72 100755 (executable)
--- 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 326a148c9ea62d33621b1c49b0806e274b8e24a9..9ad8aecf3212e5663347cf0b1a5bd78015994b72 100755 (executable)
--- 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 195cc62c9bdc33876b51da8096e939308ab3b9f0..b4da9cb25fdabd4ff5b9eb40eb723f52f780664e 100755 (executable)
--- 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