Merge pull request #281 from kustodian/postgresql_db_fix_for_python_24_checkmode

Fixed postgresql_db failing on Python 2.4 with --check
reviewable/pr18780/r1
Toshio Kuratomi 10 years ago
commit b0c94cd6f6

@ -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