diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /openerp/modules/module.py | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'openerp/modules/module.py')
| -rw-r--r-- | openerp/modules/module.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 82e86e83ce2..0ccb2865796 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -177,7 +177,7 @@ def load_information_from_description_file(module, mod_path=None): if not mod_path: mod_path = get_module_path(module) - terp_file = opj(mod_path, '__openerp__.py') + terp_file = mod_path and opj(mod_path, '__openerp__.py') or False if terp_file: info = {} if os.path.isfile(terp_file): |