Fixes check mode error on Python 2.4 and wrong changed state (#2438)

* Fixes check mode error on Python 2.4 and wrong changed state

* Changes code as suggested by @bcoca
pull/18777/head
Strahinja Kustudic 9 years ago committed by Matt Clay
parent e5e1869403
commit 5d63d0b8d1

@ -164,23 +164,22 @@ def main():
try: try:
if module.check_mode: if module.check_mode:
if state == "absent": if state == "present":
changed = not ext_exists(cursor, ext) changed = not ext_exists(cursor, ext)
elif state == "present": elif state == "absent":
changed = ext_exists(cursor, ext) changed = ext_exists(cursor, ext)
module.exit_json(changed=changed,ext=ext) else:
if state == "absent":
if state == "absent": changed = ext_delete(cursor, ext)
changed = ext_delete(cursor, ext)
elif state == "present": elif state == "present":
changed = ext_create(cursor, ext) changed = ext_create(cursor, ext)
except NotSupportedError, e: except NotSupportedError, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except Exception, e: except Exception, e:
module.fail_json(msg="Database query failed: %s" % e) module.fail_json(msg="Database query failed: %s" % e)
module.exit_json(changed=changed, db=db) module.exit_json(changed=changed, db=db, ext=ext)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *

Loading…
Cancel
Save