*vc-diff*.diff

=== modified file 'openerp/tools/config.py'
*** openerp/tools/config.py	2012-12-09 22:53:49 +0000
--- openerp/tools/config.py	2012-12-17 10:10:55 +0000
***************
*** 482,489 ****
--- 482,494 ----
  
          openerp.conf.addons_paths = self.options['addons_path'].split(',')
          if opt.server_wide_modules:
+             # Take the commandline if specified
              openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(','))
+         elif self.options['server_wide_modules']:
+             # Take the config file, if any
+             openerp.conf.server_wide_modules = map(lambda m: m.strip(), self.options['server_wide_modules'].split(','))
          else:
+             # Nothing specified, just load web addon
              openerp.conf.server_wide_modules = ['web']
          if complete:
              openerp.modules.module.initialize_sys_path()