Port patch.py to python3/python2.4 syntax (#2276)

This commit is contained in:
Michael Scherer 2016-05-23 15:44:57 +02:00 committed by Matt Clay
parent 390aa7a75f
commit 06e3950efb
2 changed files with 2 additions and 2 deletions

View file

@ -76,7 +76,6 @@ env:
database/vertica/vertica_schema.py
database/vertica/vertica_user.py
f5/bigip_gtm_virtual_server.py
files/patch.py
monitoring/bigpanda.py
monitoring/boundary_meter.py
monitoring/circonus_annotation.py

View file

@ -185,7 +185,8 @@ def main():
apply_patch( patch_func, p.src, p.basedir, dest_file=p.dest, binary=p.binary, strip=p.strip,
dry_run=module.check_mode, backup=p.backup )
changed = True
except PatchError, e:
except PatchError:
e = get_exception()
module.fail_json(msg=str(e))
module.exit_json(changed=changed)