[FIX] config: avoid to accept server-wide-modules with None as a module
Fixes #14048 Fixes #14045 Closes #14051
This commit is contained in:
parent
9f09c625f5
commit
c39ca45c6d
|
@ -142,7 +142,7 @@ class configmanager(object):
|
||||||
group.add_option("--addons-path", dest="addons_path",
|
group.add_option("--addons-path", dest="addons_path",
|
||||||
help="specify additional addons paths (separated by commas).",
|
help="specify additional addons paths (separated by commas).",
|
||||||
action="callback", callback=self._check_addons_path, nargs=1, type="string")
|
action="callback", callback=self._check_addons_path, nargs=1, type="string")
|
||||||
group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules. Default is 'web,web_kanban'")
|
group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules.", my_default='web,web_kanban')
|
||||||
|
|
||||||
group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(),
|
group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(),
|
||||||
help="Directory where to store Odoo data")
|
help="Directory where to store Odoo data")
|
||||||
|
@ -408,6 +408,9 @@ class configmanager(object):
|
||||||
# the same for the pidfile
|
# the same for the pidfile
|
||||||
if self.options['pidfile'] in ('None', 'False'):
|
if self.options['pidfile'] in ('None', 'False'):
|
||||||
self.options['pidfile'] = False
|
self.options['pidfile'] = False
|
||||||
|
# and the server_wide_modules
|
||||||
|
if self.options['server_wide_modules'] in ('', 'None', 'False'):
|
||||||
|
self.options['server_wide_modules'] = 'web,web_kanban'
|
||||||
|
|
||||||
# if defined dont take the configfile value even if the defined value is None
|
# if defined dont take the configfile value even if the defined value is None
|
||||||
keys = ['xmlrpc_interface', 'xmlrpc_port', 'longpolling_port',
|
keys = ['xmlrpc_interface', 'xmlrpc_port', 'longpolling_port',
|
||||||
|
@ -530,20 +533,13 @@ class configmanager(object):
|
||||||
#if self.options['db_host']:
|
#if self.options['db_host']:
|
||||||
# self._generate_pgpassfile()
|
# self._generate_pgpassfile()
|
||||||
|
|
||||||
# server_wide_modules defaults to web,web_kanban if empty or unset
|
|
||||||
server_wide_modules = self.options['server_wide_modules'] = (
|
|
||||||
self.options['server_wide_modules']
|
|
||||||
if self.options['server_wide_modules']
|
|
||||||
else 'web,web_kanban'
|
|
||||||
)
|
|
||||||
|
|
||||||
if opt.save:
|
if opt.save:
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
openerp.conf.addons_paths = self.options['addons_path'].split(',')
|
openerp.conf.addons_paths = self.options['addons_path'].split(',')
|
||||||
|
|
||||||
openerp.conf.server_wide_modules = [
|
openerp.conf.server_wide_modules = [
|
||||||
m.strip() for m in server_wide_modules.split(',')
|
m.strip() for m in self.options['server_wide_modules'].split(',') if m.strip()
|
||||||
]
|
]
|
||||||
|
|
||||||
def _generate_pgpassfile(self):
|
def _generate_pgpassfile(self):
|
||||||
|
|
Loading…
Reference in New Issue