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

Port mount to python3 and python 2.4 compatible syntax (#3678)

Browse source
This commit is contained in:
Michael Scherer 2016-05-17 19:22:29 +02:00 committed by Matt Clay
parent fd61e81764
commit c793571bc3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/system/mount.py
View file

@ -310,7 +310,8 @@ def main():
if os.path.exists(name): if os.path.exists(name):
try: try:
os.rmdir(name) os.rmdir(name)
except (OSError, IOError), e: except (OSError, IOError):
e = get_exception()
module.fail_json(msg="Error rmdir %s: %s" % (name, str(e))) module.fail_json(msg="Error rmdir %s: %s" % (name, str(e)))
module.exit_json(changed=changed, **args) module.exit_json(changed=changed, **args)
@ -330,7 +331,8 @@ def main():
if not os.path.exists(name) and not module.check_mode: if not os.path.exists(name) and not module.check_mode:
try: try:
os.makedirs(name) os.makedirs(name)
except (OSError, IOError), e: except (OSError, IOError):
e = get_exception()
module.fail_json(msg="Error making dir %s: %s" % (name, str(e))) module.fail_json(msg="Error making dir %s: %s" % (name, str(e)))
name, changed = set_mount(module, **args) name, changed = set_mount(module, **args)