From: Daniel Robbins <drobbins@gentoo.org>
Date: Thu, 6 Nov 2003 02:31:20 +0000 (+0000)
Subject: /root/.ccache cleanup fix
X-Git-Tag: CATALYST_1_0_1~191
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cfd572778e1f21c850262f521fd31d9bd1f6e24;p=catalyst.git

/root/.ccache cleanup fix


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

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 793ab285..19280c82 100644
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -2,10 +2,10 @@ import sys,string,os
 
 required_config_file_values=["storedir","sharedir","distdir","portdir"]
 valid_config_file_values=required_config_file_values[:]
-valid_config_file_values.append("CCACHE")
-valid_config_file_values.append("PKGCACHE")
 valid_config_file_values.append("options")
 
+verbosity=1
+
 class CatalystError(Exception):
 	def __init__(self, message):
 		if message:
@@ -24,6 +24,10 @@ def cmd(mycmd,myexc=""):
 	if retval != 0:
 		raise CatalystError,myexc
 
+def msg(mymsg,verblevel=1):
+	if verbosity>=verblevel:
+		print mymsg
+
 def ismount(path):
 	"enhanced to handle bind mounts"
 	if os.path.ismount(path):
diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index 0afb13b5..9aa16170 100755
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.5 2003/11/03 02:43:55 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.6 2003/11/06 02:31:20 drobbins Exp $
 
 case $1 in
 enter)
@@ -26,9 +26,8 @@ run)
 EOF
 	[ $? -ne 0 ] && exit 1 
 	;;
-clean)
-	# we need to have catalyst un-bind-mount things before
-	# we clean up.
+preclean)
+	#preclean runs with bind-mounts active
 	$clst_CHROOT $clst_chroot_path /bin/bash << EOF
 	env-update
 	source /etc/profile
@@ -39,7 +38,7 @@ clean)
 EOF
 	[ $? -ne 0 ] && exit 1 
 	;;
-preclean)
+clean)
 	exit 0
 	;;
 *)