From d11103b2f11a134fca98e6196da65808961862a9 Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Fri, 24 Jun 2011 16:21:08 +0530 Subject: [Fix] document_ftp: In pooler method is remvoe so i rename the method bzr revid: sbh@tinyerp.com-20110624105108-w8pbhpb1mfb0kcfk --- addons/document_ftp/ftpserver/abstracted_fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/document_ftp/ftpserver') diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 7580a8831cf..b8ce97a7017 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -68,7 +68,7 @@ class abstracted_fs(object): db, cr = None, None try: try: - db = pooler.get_db_only(db_name) + db = pooler.get_db(db_name) cr = db.cursor() cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'") if not cr.fetchone(): -- cgit v1.2.3 From 28f900202becbdc6ab0d944557353fcc075d5b24 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 9 Sep 2011 13:39:16 +0200 Subject: [FIX] document_ftp/document_webdav: correctly fix what was incorrectly fixed in revno 4821, revision-id tfr@openerp.com-20110628141309-oag99snygj3vuqwn : pooler.get_db_only was removed from the server but not from the addons. It seems the commit 4821 tried to solved the situation by using get_db instead, which is wrong and it will load the db instead of just trying to get a cursor. This commit solves correctly the removel of get_db_only: by using sql_db.db_connect (for which get_db_only was an alias). bzr revid: vmt@openerp.com-20110909113916-td9o8yct0u5bitb6 --- addons/document_ftp/ftpserver/abstracted_fs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/document_ftp/ftpserver') diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index b8ce97a7017..83cd1cde725 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -11,6 +11,7 @@ import fnmatch import pooler import netsvc +import sql_db from service import security from osv import osv @@ -68,7 +69,7 @@ class abstracted_fs(object): db, cr = None, None try: try: - db = pooler.get_db(db_name) + db = sql_db.db_connect(db_name) cr = db.cursor() cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'") if not cr.fetchone(): -- cgit v1.2.3