ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Also catch mysql errors so we can give the error message back through json rather than tracebacking

Browse source
This commit is contained in:
Toshio Kuratomi 2015-01-12 14:36:57 -08:00 committed by Matt Clay
parent 0a745de765
commit e11ea4b402
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -498,16 +498,14 @@ def main():
if user_exists(cursor, user, host): if user_exists(cursor, user, host):
try: try:
changed = user_mod(cursor, user, host, password, priv, append_privs) changed = user_mod(cursor, user, host, password, priv, append_privs)
except SQLParseError, e: except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except InvalidPrivsError, e:
module.mail_json(msg=str(e))
else: else:
if password is None: if password is None:
module.fail_json(msg="password parameter required when adding a user") module.fail_json(msg="password parameter required when adding a user")
try: try:
changed = user_add(cursor, user, host, password, priv) changed = user_add(cursor, user, host, password, priv)
except SQLParseError, e: except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
elif state == "absent": elif state == "absent":
if user_exists(cursor, user, host): if user_exists(cursor, user, host):