diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 15:27:35 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 15:27:35 +0200 |
| commit | f308b09a9ab3f3bf452fdd1ac6c2c86812732110 (patch) | |
| tree | 9506e8e830ce1e6737c1f7c87b451f60bbb2cbff /odoo/modules/module.py | |
| parent | 30260bbb0ee683c67cf8ddd0358f40fbd2f5dd0f (diff) | |
| parent | 856476d4418390ca89ef161e31faf61248eeaa1d (diff) | |
[MERGE] forward port branch saas-13 up to 856476d
Diffstat (limited to 'odoo/modules/module.py')
| -rw-r--r-- | odoo/modules/module.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/odoo/modules/module.py b/odoo/modules/module.py index 66cbae460f0..77fb1433d13 100644 --- a/odoo/modules/module.py +++ b/odoo/modules/module.py @@ -156,7 +156,9 @@ def get_module_path(module, downloaded=False, display_warning=True): """ initialize_sys_path() for adp in ad_paths: - if os.path.exists(opj(adp, module)) or os.path.exists(opj(adp, '%s.zip' % module)): + files = [opj(adp, module, manifest) for manifest in MANIFEST_NAMES] +\ + [opj(adp, module + '.zip')] + if any(os.path.exists(f) for f in files): return opj(adp, module) if downloaded: |