cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mysql_db: use new exception handling, fixes build (#4373)

Browse source
This commit is contained in:
René Moser 2016-08-10 12:35:01 +02:00 committed by Matt Clay
parent 9549883e78
commit 03022875c4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/database/mysql/mysql_db.py
View file

@ -322,7 +322,7 @@ def main():
module.fail_json(msg="%s" % stderr) module.fail_json(msg="%s" % stderr)
else: else:
module.exit_json(changed=True, db=db, msg=stdout) module.exit_json(changed=True, db=db, msg=stdout)
elif state == "import": elif state == "import":
if module.check_mode: if module.check_mode:
module.exit_json(changed=True, db=db) module.exit_json(changed=True, db=db)
@ -334,7 +334,7 @@ def main():
module.fail_json(msg="%s" % stderr) module.fail_json(msg="%s" % stderr)
else: else:
module.exit_json(changed=True, db=db, msg=stdout) module.exit_json(changed=True, db=db, msg=stdout)
elif state == "present": elif state == "present":
if module.check_mode: if module.check_mode:
module.exit_json(changed=False, db=db) module.exit_json(changed=False, db=db)
@ -366,7 +366,8 @@ def main():
module.fail_json(msg="%s" % stderr) module.fail_json(msg="%s" % stderr)
else: else:
module.exit_json(changed=True, db=db, msg=stdout) module.exit_json(changed=True, db=db, msg=stdout)
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="error creating database: " + str(e)) module.fail_json(msg="error creating database: " + str(e))
elif state == "absent": elif state == "absent":