*vc-diff*.diff

=== modified file 'openerp/tools/config.py'
*** openerp/tools/config.py	2013-01-15 12:40:58 +0000
--- openerp/tools/config.py	2013-02-22 14:02:16 +0000
***************
*** 154,160 ****
          # WEB
          # TODO move to web addons after MetaOption merge
          group = optparse.OptionGroup(parser, "Web interface Configuration")
!         group.add_option("--db-filter", dest="dbfilter", default='.*',
                           help="Filter listed database", metavar="REGEXP")
          parser.add_option_group(group)
  
--- 154,160 ----
          # WEB
          # TODO move to web addons after MetaOption merge
          group = optparse.OptionGroup(parser, "Web interface Configuration")
!         group.add_option("--db-filter", dest="dbfilter", my_default='.*',
                           help="Filter listed database", metavar="REGEXP")
          parser.add_option_group(group)
  
***************
*** 481,489 ****
--- 481,494 ----
              self.save()
  
          openerp.conf.addons_paths = self.options['addons_path'].split(',')
+         # Take the commandline --load options
          if opt.server_wide_modules:
              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
+             openerp.conf.server_wide_modules = map(lambda m: m.strip(), self.options['server_wide_modules'].split(','))
          else:
+             # Use the default
              openerp.conf.server_wide_modules = ['web','web_kanban']
          if complete:
              openerp.modules.module.initialize_sys_path()