Fixed postgresql_db failing on Python 2.4 with --check

This reverts commit 81cbdb6c8c and adds ignoring of the SystemExit exception because of Python 2.4.
pull/18777/head
kustodian 10 years ago committed by Matt Clay
parent e359f7cfcf
commit 8621f9a7cd

@ -311,6 +311,9 @@ def main():
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except NotSupportedError, e: except NotSupportedError, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except SystemExit:
# Avoid catching this on Python 2.4
raise
except Exception, e: except Exception, e:
module.fail_json(msg="Database query failed: %s" % e) module.fail_json(msg="Database query failed: %s" % e)

Loading…
Cancel
Save