From 5ec4da2ee251a1ec422378632b6c4a3e10b92da1 Mon Sep 17 00:00:00 2001 From: xmo-odoo Date: Wed, 6 Mar 2019 15:02:38 +0000 Subject: [IMP] base_module_import: ignore garbage directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the zipfile contains some garbage directories (e.g. leftover empty directories from git, `__MACOSX` metadata folder, …) it seems unnecessary to log an error, just skip the directory and don't mark it as a proper / successful module. closes odoo/odoo#31639 Signed-off-by: Xavier Morel (xmo) --- addons/base_import_module/models/ir_module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/base_import_module/models/ir_module.py') 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) -- cgit v1.2.3