diff options
| author | Denis Ledoux <dle@odoo.com> | 2019-04-24 09:31:49 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2019-04-24 09:31:49 +0200 |
| commit | 0c46c8a929d8702574c02db28d3bbadac3aabaf9 (patch) | |
| tree | d601feec46d9a483cff5ea84e5721c0e788a86b6 /addons/base_import_module/models | |
| parent | 47ebb835e5baed52ac089663f2fb57b3c4993186 (diff) | |
| parent | 6fd092e131bdbefce2cc9de4db9bb1fd533e8329 (diff) | |
[MERGE] forward port branch saas-14 up to 6fd092e131b
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 e0b18dd355a..ff55205bdf2 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -28,6 +28,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) unmet_dependencies = set(terp['depends']).difference(installed_mods) @@ -110,8 +112,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, e: _logger.exception('Error while importing module') errors[mod_name] = exception_to_unicode(e) |