summaryrefslogtreecommitdiff
path: root/addons/base_import_module
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-05-06 12:27:51 +0200
committerChristophe Simonis <chs@odoo.com>2019-05-06 12:27:51 +0200
commita97037c6d442f186a798322a6eff586a3a118ef3 (patch)
tree930cf70045eb8ec16323ccab3c4f6023aedb83bb /addons/base_import_module
parente5fc29564532e3c11a48b8c98a69675580d2c572 (diff)
parent78b3b650b0ddcb5fb53fda505e9e61510a1364fc (diff)
[MERGE] forward port branch saas-12.2 up to 78b3b650b0d
Diffstat (limited to 'addons/base_import_module')
-rw-r--r--addons/base_import_module/models/ir_module.py6
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)