summaryrefslogtreecommitdiff
path: root/odoo/modules/module.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-16 11:34:22 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-16 11:34:22 +0200
commita256e1ed34aed0ba64e839f1eb187baec43facf2 (patch)
tree04705cfc9871829a46df2b0b6d4db10ee5b2925e /odoo/modules/module.py
parentc129ae36aae69b64fe38ca106e69ea5661f4c0f9 (diff)
[FIX] core: adpat 9874892b9 to multiple manifest files
Diffstat (limited to 'odoo/modules/module.py')
-rw-r--r--odoo/modules/module.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/odoo/modules/module.py b/odoo/modules/module.py
index 1ff0d2d0ed1..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, MANIFEST)) 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: