Specify modules through ini file sections

Instead of listing all the modules in [global].modules,
load all modules specified in the .ini file using [module] notation.

This makes the config file format more friendly to making a build
from various config files specified together, and avoids the annoying
cases when you add a new [configuration section] but forget to add
the module to the module list (not realising your mistake until after
the build has completed).

1 files changed, 3 insertions, 12 deletions

diff --git a/osbuilder.py b/osbuilder.py
index 32d5c48..0cddd94 100755
--- a/osbuilder.py
+++ b/osbuilder.py
@@ -300,18 +300,9 @@ class OsBuilder(object):
                 print "Press Ctrl+C to abort. Continuing in 15 seconds."
                 time.sleep(15)
 
-        self.modules = []
-        for option in self.cfg.options('global'):
-            if not option.startswith('modules_') and option != "modules":
-                continue
-            self.modules.extend(self.cfg.get('global', option).split(','))
-
-        # clean up
-        for idx, mod in enumerate(self.modules):
-            self.modules[idx] = mod.strip()
-
-        # remove duplicates
-        self.modules = list(set(self.modules))
+        self.modules = self.cfg.sections()
+        if 'global' in self.modules:
+            self.modules.remove('global')
 
         self.read_config()