cherokee at cherokee-project
Aug 3, 2011, 1:13 AM
Post #1 of 1
(122 views)
Permalink
|
|
[6785] wizards2/cherokee-wizard: WIP: Clean up
|
|
Revision: 6785
http://svn.cherokee-project.com/changeset/6785
Author: alo
Date: 2011-08-03 10:13:48 +0200 (Wed, 03 Aug 2011)
Log Message:
-----------
WIP: Clean up
Modified Paths:
--------------
wizards2/cherokee-wizard
Modified: wizards2/cherokee-wizard
===================================================================
--- wizards2/cherokee-wizard 2011-08-02 21:23:07 UTC (rev 6784)
+++ wizards2/cherokee-wizard 2011-08-03 08:13:48 UTC (rev 6785)
@@ -51,34 +51,18 @@
# 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
+ # Go through all the installation phases
+ for phase in (installer.Check_Parameters,
+ installer.Check_Prerequisites,
+ installer.Download_Unpack,
+ installer.Configure_Cherokee):
- # Pre-requisites
- errors = installer.Check_Prerequisites()
- if errors:
- for err in set(errors):
- print err
- return 1
+ errors = phase()
+ 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
-
print "ok"
# Save the config
|
