Fixed postgresql_db failing on Python 2.4 with --check

reviewable/pr18780/r1
kustodian 11 years ago
parent 2970b339eb
commit 81cbdb6c8c

@ -281,14 +281,13 @@ def main():
elif state == "present": elif state == "present":
changed = not db_matches(cursor, db, owner, template, encoding, changed = not db_matches(cursor, db, owner, template, encoding,
lc_collate, lc_ctype) lc_collate, lc_ctype)
module.exit_json(changed=changed,db=db) else:
if state == "absent":
if state == "absent": changed = db_delete(cursor, db)
changed = db_delete(cursor, db)
elif state == "present": elif state == "present":
changed = db_create(cursor, db, owner, template, encoding, changed = db_create(cursor, db, owner, template, encoding,
lc_collate, lc_ctype) lc_collate, lc_ctype)
except NotSupportedError, e: except NotSupportedError, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except Exception, e: except Exception, e:

Loading…
Cancel
Save