diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-11 14:48:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-11 14:48:49 +0200 |
| commit | 717f4583949219c346c87c390fbc336b4f31571c (patch) | |
| tree | 6de318d1f411006a61ebac92a5f1704c6bd59e0c /odoo/tools/config.py | |
| parent | 3c4f8533653d49198a73ab650b5aff24106ebdb1 (diff) | |
| parent | 93c22558f3691c45cb6dfe4047927a319ba1bb85 (diff) | |
[MERGE] forward port branch saas-15 up to 93c22558f36
Diffstat (limited to 'odoo/tools/config.py')
| -rw-r--r-- | odoo/tools/config.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 62a633808b0..f68a80b6ec8 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -467,6 +467,8 @@ class configmanager(object): os.path.abspath(os.path.expanduser(os.path.expandvars(x.strip()))) for x in self.options['addons_path'].split(',')) + self.options['data_dir'] = os.path.abspath(os.path.expanduser(os.path.expandvars(self.options['data_dir'].strip()))) + self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {} self.options['demo'] = (dict(self.options['init']) if not self.options['without_demo'] else {}) |