From 37de471ab6c666fb61cc7ae1af2ae4211fc693b3 Mon Sep 17 00:00:00 2001 From: Yvan Cottyn Date: Fri, 9 Nov 2012 14:27:03 +0100 Subject: [PATCH 1/2] Fix exception catching for Python 2.4 --- library/mysql_db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/mysql_db b/library/mysql_db index 9713a3dc5f8..c1e25e31b2a 100755 --- a/library/mysql_db +++ b/library/mysql_db @@ -192,7 +192,7 @@ def main(): else: db_connection = MySQLdb.connect(host=module.params["login_host"], user=login_user, passwd=login_password, db=connect_to_db) cursor = db_connection.cursor() - except Exception as e: + except Exception, e: module.fail_json(msg="unable to connect, check login_user and login_password are correct, or alternatively check ~/.my.cnf contains credentials") changed = False From e9a356bbde2aed82e36886c6ca10ace57f5b3318 Mon Sep 17 00:00:00 2001 From: Yvan Cottyn Date: Fri, 9 Nov 2012 14:28:21 +0100 Subject: [PATCH 2/2] Fix exception catching for Python 2.4 --- library/mysql_user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/mysql_user b/library/mysql_user index e30fde8ee62..7114d7bbd63 100755 --- a/library/mysql_user +++ b/library/mysql_user @@ -283,7 +283,7 @@ def main(): else: db_connection = MySQLdb.connect(host=module.params["login_host"], user=login_user, passwd=login_password, db="mysql") cursor = db_connection.cursor() - except Exception as e: + except Exception, e: module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or ~/.my.cnf has the credentials") if state == "present":