diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
| commit | e9ae419fca0a9ebd0071c280bd98fc84f268bb74 (patch) | |
| tree | 8f33c2a81a60133b04df10d7e81afbc9d54c20a6 /odoo/tools | |
| parent | 156d099e328304d0f19146f4714d13b7b572358a (diff) | |
| parent | 0de06a41326662d4505401764035bf9ddf31fc8b (diff) | |
[MERGE] forward port branch saas-11.3 up to 0de06a41326
Diffstat (limited to 'odoo/tools')
| -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 343aa6cf5a9..d9678cb4994 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -468,6 +468,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 {}) |