Merge pull request #281 from kustodian/postgresql_db_fix_for_python_24_checkmode

Fixed postgresql_db failing on Python 2.4 with --check
2014-12-14 13:43:44 -08:00 · 2014-12-14 13:43:44 -08:00 · b0c94cd6f6
commit b0c94cd6f6
parent bfc1644b34 07b98c45df
1 changed files with 3 additions and 0 deletions
--- a/database/postgresql/postgresql_db.py
+++ b/database/postgresql/postgresql_db.py
@ -311,6 +311,9 @@ def main():
                module.fail_json(msg=str(e))
    except NotSupportedError, e:
        module.fail_json(msg=str(e))
+    except SystemExit:
+        # Avoid catching this on Python 2.4 
+        raise
    except Exception, e:
        module.fail_json(msg="Database query failed: %s" % e)