Ensure all components get their chance to insert their own command-line switches

1 files changed, 22 insertions, 17 deletions

diff --git a/pykolab/setup/components.py b/pykolab/setup/components.py
index 4633160..f69db05 100644
--- a/pykolab/setup/components.py
+++ b/pykolab/setup/components.py
@@ -32,7 +32,7 @@ components = {}
 component_groups = {}
 executed_components = []
 
-executed_components = []
+finalize_conf_ok = None
 
 def __init__():
     # We only want the base path
@@ -116,8 +116,26 @@ def _list_components(*args, **kw):
 
     return _components
 
+def cli_options_from_component(component_name, *args, **kw):
+    if components[component_name].has_key('group'):
+        group = components[component_name]['group']
+        component_name = components[component_name]['component_name']
+        try:
+            exec("from %s.setup_%s import cli_options as %s_%s_cli_options" % (group,component_name,group,component_name))
+            exec("%s_%s_cli_options()" % (group,component_name))
+        except ImportError, e:
+            pass
+
+    else:
+        try:
+            exec("from setup_%s import cli_options as %s_cli_options" % (component_name,component_name))
+            exec("%s_cli_options()" % (component_name))
+        except ImportError, e:
+            pass
+
 def execute(component_name, *args, **kw):
     if component_name == '':
+
         log.debug(
                 _("No component selected, continuing for all components"),
                 level=8
@@ -152,6 +170,9 @@ def execute(component_name, *args, **kw):
                 break
 
         return
+    else:
+        for component in _list_components():
+            cli_options_from_component(component)
 
     if not components.has_key(component_name):
         log.error(_("No such component."))
@@ -162,22 +183,6 @@ def execute(component_name, *args, **kw):
         log.error(_("No such component."))
         sys.exit(1)
 
-    if components[component_name].has_key('group'):
-        group = components[component_name]['group']
-        component_name = components[component_name]['component_name']
-        try:
-            exec("from %s.setup_%s import cli_options as %s_%s_cli_options" % (group,component_name,group,component_name))
-            exec("%s_%s_cli_options()" % (group,component_name))
-        except ImportError, e:
-            pass
-
-    else:
-        try:
-            exec("from setup_%s import cli_options as %s_cli_options" % (component_name,component_name))
-            exec("%s_cli_options()" % (component_name))
-        except ImportError, e:
-            pass
-
     conf.finalize_conf()
 
     if len(conf.cli_args) >= 1: