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

pull/18777/head
Toshio Kuratomi 10 years ago committed by Matt Clay
parent 0a745de765
commit e11ea4b402

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

Loading…
Cancel
Save