diff options
| author | Denis Ledoux <dle@odoo.com> | 2019-05-02 09:42:08 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2019-05-02 09:45:14 +0200 |
| commit | fd0a10026c06315b4fbe520a7a3604a6b395f54a (patch) | |
| tree | 5a7183126ed508303bdab7a31d3691c75e6d9b4a /addons/base_import_module/models | |
| parent | 27eb8ba61798e7bc65bb75becc3f89c839a61996 (diff) | |
| parent | b11930047f6652ccf03963c3f18a2a38c502b652 (diff) | |
[MERGE] forward port branch saas-12.1 up to b11930047f6
Diffstat (limited to 'addons/base_import_module/models')
| -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 128594cc824..9d650a4b6fb 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) |