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

Merge pull request #281 from kustodian/postgresql_db_fix_for_python_24_checkmode

Browse source 
Fixed postgresql_db failing on Python 2.4 with --check
This commit is contained in:
Toshio Kuratomi 2014-12-14 13:43:44 -08:00
commit b0c94cd6f6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
database/postgresql/postgresql_db.py
View file

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