diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-11 16:29:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-11 16:29:46 +0200 |
| commit | 1ade6675c37e463e67fe958e1c0b79f24c97e281 (patch) | |
| tree | 739750e52a76d20f90ab7c65877386a05ca0969f /odoo/tools/config.py | |
| parent | 32b19115e9d7470531f3218b39e8773ba5361bba (diff) | |
| parent | 717f4583949219c346c87c390fbc336b4f31571c (diff) | |
[MERGE] forward port branch 11.0 up to 717f4583949
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 5256da34968..feed019a4c7 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 {}) |