From 64773ba35712463883b29eaa56e3c3a7cbf4b358 Mon Sep 17 00:00:00 2001 From: Ronald Portier Date: Wed, 1 Feb 2012 12:37:59 +0100 Subject: [PATCH] [FIX] drop database fails when done before connecting to server. lp bug: https://launchpad.net/bugs/924783 fixed bzr revid: ronald@therp.nl-20120201113759-wi2kogl2x1lsxk7g --- .bzrignore | 2 ++ openerp/sql_db.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 62f8a05c90f..57c55e1a728 100644 --- a/.bzrignore +++ b/.bzrignore @@ -21,3 +21,5 @@ bin/pil*.py .project .pydevproject .settings +profiledata +*.moved diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 45460bebe43..9eb2a88ada2 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -509,8 +509,10 @@ def db_connect(db_name): return Connection(_Pool, db_name) def close_db(db_name): + global _Pool """ You might want to call openerp.modules.registry.RegistryManager.delete(db_name) along this function.""" - _Pool.close_all(dsn(db_name)) + if _Pool: + _Pool.close_all(dsn(db_name)) ct = currentThread() if hasattr(ct, 'dbname'): delattr(ct, 'dbname')