Adding a note to myself for better debug and moving run_default_funcs to the bottom...

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

diff --git a/ChangeLog b/ChangeLog
index b7748d6e0f995008a31ce0ed20f6e8e2164195b8..3548f9c05bc0ad3a685d6f903528622c155689ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  21 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/chroot-functions.sh:
+  Adding a note to myself for better debug and moving run_default_funcs to the
+  bottom of the script so it gets executed. Since this can otherwise break
+  pkgcache, I'm making this catalyst 2.0.6_pre9 for testing, immediately.
+
   21 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
   targets/support/chroot-functions.sh:

diff --git a/catalyst b/catalyst
index 4c634d991a3df9c791fa4c62427ef413cd39e3ed..d6c42634203742f63629c9424d16cd75dabc8d79 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre8"
+__version__="2.0.6_pre9"
 
 conf_values={}
 

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index e15c8309105751f3d5529f1050d5aba3aaa8624a..59a0b77b7d98d0c58f2adb38f8d63cfafa3e993a 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -14,9 +14,6 @@ trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
 #      * kernel recognizes this and generates SIGINT signal
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
 
-# We do this everywhere, so why not put it in this script
-run_default_funcs
-
 check_genkernel_version(){
        if [ -x /usr/bin/genkernel ]
        then
@@ -285,6 +282,9 @@ show_debug() {
                echo "Profile/target info:"
                echo "Profile inheritance:"
                python -c 'import portage; print portage.settings.profiles'
+               # TODO: grab our entire env
+               # <zmedico> to get see the ebuild env you can do something like:
+               # `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc
                echo
                echo "STAGE1_USE:            $(portageq envvar STAGE1_USE)"
                echo
@@ -323,7 +323,7 @@ show_debug() {
 }
 
 run_default_funcs() {
-       if [ -z "${RUN_DEFAULT_FUNCS}" ]
+       if [ "${RUN_DEFAULT_FUNCS}" != "no" ]
        then
                update_env_settings
                setup_myfeatures
@@ -419,3 +419,7 @@ GenericName=Gentoo Linux Handbook
 Comment=This is a link to the local copy of the Gentoo Linux Handbook.
 Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
 }
+
+# We do this everywhere, so why not put it in this script
+run_default_funcs
+