diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-11-02 14:47:32 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-11-02 14:47:32 +0100 |
| commit | 38336593f736ffbdf1365e99337abe891d4678fb (patch) | |
| tree | 2504e1362c0b4f03eef59b3ee51e44bda07da5dc | |
| parent | eb9cefed2e2b76526564cf94b6505ae4aac748bf (diff) | |
[IMP] registry: the `assertion_report` is now a registry attribute.
This allow us to report failure or success by inspecting the registry.
bzr revid: vmt@openerp.com-20121102134732-5uy1vp59mp1bxgjs
| -rw-r--r-- | openerp/modules/loading.py | 3 | ||||
| -rw-r--r-- | openerp/modules/registry.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 57fb92a6ee0..200f144d595 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -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']: diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py index ae9772b661a..5aa2eca26ef 100644 --- a/openerp/modules/registry.py +++ b/openerp/modules/registry.py @@ -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() |