From: Andrew Gaffney <agaffney@gentoo.org>
Date: Wed, 14 Jan 2009 13:44:49 +0000 (-0600)
Subject: Add clean no-op for system target
X-Git-Tag: CATALYST-2.0.10~3^2~151
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59ec20188662fa56ed532992fffb252c3024562c;p=catalyst.git

Add clean no-op for system target
---

diff --git a/ChangeLog b/ChangeLog
index b16bd384..4aa49609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  14 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/spawn.py, targets/system/system-controller.sh:
+  Add clean no-op for system target
+
   14 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/arch/alpha.py, modules/catalyst/arch/amd64.py,
   modules/catalyst/arch/arm.py, modules/catalyst/arch/hppa.py,
diff --git a/modules/catalyst/spawn.py b/modules/catalyst/spawn.py
index cfd1c037..11e8497b 100644
--- a/modules/catalyst/spawn.py
+++ b/modules/catalyst/spawn.py
@@ -298,9 +298,9 @@ def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,retur
 def cmd(mycmd,myexc="",env={}):
 	try:
 		sys.stdout.flush()
-		retval=spawn_bash(mycmd,env)
+		retval = spawn_bash(mycmd, env)
 		if retval != 0:
-			raise CatalystError,myexc
+			raise CatalystError(myexc + " (exit code " + str(retval) + ")")
 	except:
 		raise
 
diff --git a/targets/system/system-controller.sh b/targets/system/system-controller.sh
index f150c084..419a9f22 100644
--- a/targets/system/system-controller.sh
+++ b/targets/system/system-controller.sh
@@ -22,6 +22,8 @@ case $1 in
 	preclean)
 		exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /${clst_root_path} || exit 1
 	;;
+	clean)
+	;;
 	*)
 		exit 1
 	;;