Permalink
Browse files

WIP: Clean up

git-svn-id: svn://cherokee-project.com/wizards2@6785 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
alobbs committed Aug 3, 2011
1 parent a366370 commit e072303121e556a2aa0572b0af5e121a800625b3
Showing with 11 additions and 27 deletions.
  1. +11 −27 cherokee-wizard
View
@@ -51,33 +51,17 @@ def install (wizard_path, params):
# Launch the wizard
installer = mod.Install (params.copy())
- # Check parameters
- errors = installer.Check_Parameters()
- if errors:
- for err in set(errors):
- print err
- return 1
-
- # Pre-requisites
- errors = installer.Check_Prerequisites()
- if errors:
- for err in set(errors):
- print err
- return 1
-
- # Download and Unpack
- errors = installer.Download_Unpack()
- if errors:
- for err in set(errors):
- print err
- return 1
-
- # Cherokee Configuration
- errors = installer.Configure_Cherokee()
- if errors:
- for err in set(errors):
- print err
- return 1
+ # Go through all the installation phases
+ for phase in (installer.Check_Parameters,
+ installer.Check_Prerequisites,
+ installer.Download_Unpack,
+ installer.Configure_Cherokee):
+
+ errors = phase()
+ if errors:
+ for err in set(errors):
+ print err
+ return 1
print "ok"

0 comments on commit e072303

Please sign in to comment.