From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 9 May 2008 01:49:44 +0000 (+0000)
Subject: We don't want to run setup_myfeatures in preclean, but still want to update the envir... 
X-Git-Tag: CATALYST_2_0_6_916~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a17894138e1bee56a2d77b214e280555898e6dce;p=catalyst.git

We don't want to run setup_myfeatures in preclean, but still want to update the environment and show our debug information.

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

diff --git a/ChangeLog b/ChangeLog
index da751fcb..bca5e409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-preclean-chroot.sh,
+  targets/stage2/stage2-preclean-chroot.sh,
+  targets/stage3/stage3-preclean-chroot.sh,
+  targets/stage4/stage4-preclean-chroot.sh:
+  We don't want to run setup_myfeatures in preclean, but still want to update
+  the environment and show our debug information.
+
   25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-preclean-chroot.sh,
   targets/stage2/stage2-preclean-chroot.sh,
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index 6e8eab33..a80fc92e 100755
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 # Now, some finishing touches to initialize gcc-config....
 unset ROOT
 
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
index ddc9b31f..3b693d81 100755
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index ddc9b31f..3b693d81 100755
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 240e2cbb..8f2e8941 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 if [ -n "${clst_DISTCC}" ]
 then
 	cleanup_distcc