[MERGE] forward port of branch saas-2 up to revid 4984 chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7

bzr revid: chs@openerp.com-20131125154140-cpbk4tcdml2a3b9n

1 files changed, 2 insertions, 2 deletions

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 97737a38c3f..cf4d3855a84 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -94,11 +94,11 @@ def preload_registry(dbname):
     """ Preload a registry, and start the cron."""
     try:
         update_module = True if openerp.tools.config['init'] or openerp.tools.config['update'] else False
-        openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
+        registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
     except Exception:
         _logger.exception('Failed to initialize database `%s`.', dbname)
         return False
-    return True
+    return registry._assertion_report.failures == 0
 
 def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""