From f47795374171c3eef8389201208acb6cc965721d Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sun, 9 Nov 2008 23:16:41 +0100
Subject: exit status is maintained for phases and workers.  reporting added. 
 phases are now arrays that list the workers. phase logic reorganized in
 dieters automatic procedure

---
 src/core/procedures/base        | 52 ++++++++++++++++++-----------------------
 src/core/procedures/interactive |  2 +-
 2 files changed, 24 insertions(+), 30 deletions(-)

(limited to 'src/core')

diff --git a/src/core/procedures/base b/src/core/procedures/base
index dd2842e..2c76d16 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -8,39 +8,28 @@ var_UI_TYPE="cli" # set to cli or dia for dialog
 
 ###### Phases ( can be overridden by more specific procedures) ######
 
-phase_preparation ()
-{
-	execute worker select_source
-	execute worker runtime_network
-	execute worker runtime_packages
-}
+phase_preparation=(\
+	select_source \
+	runtime_network \
+	runtime_packages)
 
+phase_basics=(\
+	set_clock \
+	prepare_disks)
 
-phase_basics ()
-{
-	execute worker set_clock
-	execute worker prepare_disks
-}	
+phase_system=(\
+	package_list \
+	install_packages \
+	auto_fstab \
+	auto_network \
+	auto_locale \
+	configure_system \
+	mkinitcpio \
+	locales \
+	install_bootloader)
 
 
-phase_system ()
-{
-	execute worker package_list    
-	execute worker install_packages
-	execute worker auto_fstab   #TODO: exact names of these 3
-	execute worker auto_network
-	execute worker auto_locale
-	execute worker configure_system
-	execute worker mkinitcpio
-	execute worker locales
-	execute worker install_bootloader
-}
-
-
-phase_finish ()
-{
-	true
-}
+phase_finish=(msg_report)
 
 
 
@@ -153,3 +142,8 @@ worker_install_bootlader ()
 	#TODO: ask which disk, install grub on it
 	true
 }
+
+worker_msg_report ()
+{
+	show_report
+}
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 85e47b2..3bc8ee4 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -27,7 +27,7 @@ start_process ()
 	#####################
 	## begin execution ##
 
-	# install stages
+	# install stages #TODO: now that exit states of all workers are maintained by the execute function, we can probably simplify this
 	S_SRC=0         # choose install medium
 	S_NET=0         # network configuration
 	S_CLOCK=0       # clock and timezone
-- 
cgit v1.2.3-54-g00ecf