Merge pull request #1576 from vanne/devel

Fix exception catching for Python 2.4
This commit is contained in:
Michael DeHaan 2012-11-09 05:35:10 -08:00
commit 2ff3fc6aa2
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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":