[IMP] registry: the `assertion_report` is now a registry attribute.
authorVo Minh Thu <vmt@openerp.com>
Fri, 2 Nov 2012 13:47:32 +0000 (14:47 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 2 Nov 2012 13:47:32 +0000 (14:47 +0100)
This allow us to report failure or success by inspecting the registry.

bzr revid: vmt@openerp.com-20121102134732-5uy1vp59mp1bxgjs

openerp/modules/loading.py
openerp/modules/registry.py

index 57fb92a..200f144 100644 (file)
@@ -38,7 +38,6 @@ import openerp.osv as osv
 import openerp.pooler as pooler
 import openerp.release as release
 import openerp.tools as tools
-import openerp.tools.assertion_report as assertion_report
 from openerp import SUPERUSER_ID
 
 from openerp import SUPERUSER_ID
@@ -285,7 +284,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
 
         # processed_modules: for cleanup step after install
         # loaded_modules: to avoid double loading
-        report = assertion_report.assertion_report()
+        report = pool._assertion_report
         loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
 
         if tools.config['load_language']:
index ae9772b..5aa2eca 100644 (file)
@@ -32,6 +32,7 @@ import openerp.cron
 import openerp.tools
 import openerp.modules.db
 import openerp.tools.config
+from openerp.tools import assertion_report
 
 _logger = logging.getLogger(__name__)
 
@@ -49,6 +50,7 @@ class Registry(object):
         self._store_function = {}
         self._init = True
         self._init_parent = {}
+        self._assertion_report = assertion_report.assertion_report()
 
         # modules fully loaded (maintained during init phase by `loading` module)
         self._init_modules = set()