diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-11-14 14:05:35 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-11-14 14:05:35 +0100 |
| commit | ccbbb94b19ed848b2bc1324d1ea85494c615ec6f (patch) | |
| tree | 3b5956d175918c59d0c4b893082511ef3a0d9734 | |
| parent | de39dccefb1bb8362204d84ccfaa44aac480a4bb (diff) | |
| parent | 6fe4d552510316c48ae9f98c39ec7f0613c68223 (diff) | |
[MERGE] loading: explicitely allow .js file, log a warning for unknown types.
bzr revid: vmt@openerp.com-20121114130535-0ts5rbh51wre98ag
| -rw-r--r-- | openerp/modules/loading.py | 7 | ||||
| -rw-r--r-- | openerp/modules/module.py | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 200f144d595..c3d73859730 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -112,6 +112,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= if kind in ('demo', 'demo_xml'): noupdate = True try: + ext = ext.lower() if ext == '.csv': if kind in ('init', 'init_xml'): noupdate = True @@ -120,8 +121,12 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= process_sql_file(cr, fp) elif ext == '.yml': tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report) - else: + elif ext == '.xml': tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report) + elif ext == '.js': + pass # .js files are valid but ignored here. + else: + _logger.warning("Can't load unknown file type %s.", filename) finally: fp.close() diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 6ec9e86340c..39c9817a878 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -28,15 +28,9 @@ import sys import types import zipimport -import openerp - -import openerp.osv as osv import openerp.tools as tools import openerp.tools.osutil as osutil from openerp.tools.safe_eval import safe_eval as eval -from openerp.tools.translate import _ - -import openerp.netsvc as netsvc import zipfile import openerp.release as release @@ -48,9 +42,6 @@ from cStringIO import StringIO import logging -import openerp.modules.db -import openerp.modules.graph - _logger = logging.getLogger(__name__) _ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base) @@ -335,7 +326,6 @@ def load_information_from_description_file(module): 'description': '', 'icon': get_module_icon(module), 'installable': True, - 'auto_install': False, 'license': 'AGPL-3', 'name': False, 'post_load': None, |