diff options
| author | Denis Ledoux <dle@odoo.com> | 2019-04-24 09:47:19 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2019-04-24 10:04:05 +0200 |
| commit | b71b78035b96967f3428843095004fa897196f69 (patch) | |
| tree | a375a2145646fcb76561d1dc71b96e1b3517c6ec /addons/base_import_module | |
| parent | d6ad22227cc7b3f36ac9914cce4f8a1f0a0f36a2 (diff) | |
| parent | 0c46c8a929d8702574c02db28d3bbadac3aabaf9 (diff) | |
[MERGE] forward port branch saas-15 up to 0c46c8a929d
Diffstat (limited to 'addons/base_import_module')
| -rw-r--r-- | addons/base_import_module/models/ir_module.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index df7ad832d86..2c72ad42ff4 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -38,6 +38,8 @@ class IrModule(models.Model): installed_mods = [m.name for m in known_mods if m.state == 'installed'] terp = load_information_from_description_file(module, mod_path=path) + if not terp: + return False values = self.get_values_from_terp(terp) if 'version' in terp: values['latest_version'] = terp['version'] @@ -133,8 +135,8 @@ class IrModule(models.Model): try: # assert mod_name.startswith('theme_') path = opj(module_dir, mod_name) - self._import_module(mod_name, path, force=force) - success.append(mod_name) + if self._import_module(mod_name, path, force=force): + success.append(mod_name) except Exception as e: _logger.exception('Error while importing module') errors[mod_name] = exception_to_unicode(e) |