summaryrefslogtreecommitdiff
path: root/addons/base_import_module
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2016-10-04 00:53:15 +0200
committerOlivier Dony <odo@openerp.com>2016-10-04 01:20:17 +0200
commitf9da4970ab8f140eb74de5e48b2f2c4a3006a222 (patch)
tree17a11ff5e92174b1a1d4de423e5021c09d7802bc /addons/base_import_module
parent48b4da63e704692eac349561eab5158f9b1a7637 (diff)
parenteb6b256f99cd7e8c11e250691d50d6c64c891daa (diff)
[MERGE] Forward-port saas-11 up to eb6b256f99cd7e8c11e250691d50d6c64c891daa
Diffstat (limited to 'addons/base_import_module')
-rw-r--r--addons/base_import_module/models/ir_module.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py
index cee635ca25c..7f5dbe626f3 100644
--- a/addons/base_import_module/models/ir_module.py
+++ b/addons/base_import_module/models/ir_module.py
@@ -44,6 +44,10 @@ class ir_module_module(osv.osv):
for kind in ['data', 'init_xml', 'update_xml']:
for filename in terp[kind]:
+ ext = os.path.splitext(filename)[1].lower()
+ if ext not in ('.xml', '.csv', '.sql'):
+ _logger.info("module %s: skip unsupported file %s", module, filename)
+ continue
_logger.info("module %s: loading %s", module, filename)
noupdate = False
if filename.endswith('.csv') and kind in ('init', 'init_xml'):