summaryrefslogtreecommitdiff
path: root/odoo/modules/loading.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-10 19:14:30 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-10 19:14:30 +0200
commit0be264b29eac11a5dec5e6565d23d4ea86bd905a (patch)
tree79362f2340c89cb3cf2e8d8a467f357b7c7a8326 /odoo/modules/loading.py
parentcf753a7fdf1739dcf37d2ad74f4c8efb3d4ff3b3 (diff)
parente1104ac344cbc349a46b22339b13dfe9cbab8bcb (diff)
[MERGE] forward port branch 11.0 up to e1104ac344c
Diffstat (limited to 'odoo/modules/loading.py')
-rw-r--r--odoo/modules/loading.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/odoo/modules/loading.py b/odoo/modules/loading.py
index b56377bcf3e..d8ee12c1690 100644
--- a/odoo/modules/loading.py
+++ b/odoo/modules/loading.py
@@ -166,7 +166,8 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
overwrite = odoo.tools.config["overwrite_existing_translations"]
module.with_context(overwrite=overwrite)._update_translations()
- registry._init_modules.add(package.name)
+ if package.name is not None:
+ registry._init_modules.add(package.name)
if new_install:
post_init = package.info.get('post_init_hook')
@@ -201,7 +202,8 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
if hasattr(package, kind):
delattr(package, kind)
- registry._init_modules.add(package.name)
+ if package.name is not None:
+ registry._init_modules.add(package.name)
cr.commit()
_logger.log(25, "%s modules loaded in %.2fs, %s queries", len(graph), time.time() - t0, odoo.sql_db.sql_counter - t0_sql)