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

Merge pull request #860 from goozbach/broken_mount

Browse source 
fixed missing module argument for mount module
This commit is contained in:
Michael DeHaan 2012-08-13 15:29:43 -07:00
commit e29ee9db2b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/mount
View file

@ -215,13 +215,13 @@ def main():
if os.path.ismount(name): if os.path.ismount(name):
res,msg = umount(**args) res,msg = umount(**args)
if res: if res:
fail_json(msg="Error unmounting %s: %s" % (name, msg)) module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
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:
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)
@ -229,7 +229,7 @@ def main():
if os.path.ismount(name): if os.path.ismount(name):
res,msg = umount(**args) res,msg = umount(**args)
if res: if res:
fail_json(msg="Error unmounting %s: %s" % (name, msg)) module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
changed = True changed = True
module.exit_json(changed=changed, **args) module.exit_json(changed=changed, **args)
@ -241,7 +241,7 @@ def main():
try: try:
os.makedirs(name) os.makedirs(name)
except (OSError, IOError), e: except (OSError, IOError), e:
fail_json(msg="Error making dir %s: %s" % (name, str(e))) module.fail_json(msg="Error making dir %s: %s" % (name, str(e)))
res = 0 res = 0
if os.path.ismount(name): if os.path.ismount(name):
@ -252,7 +252,7 @@ def main():
res,msg = mount(**args) res,msg = mount(**args)
if res: if res:
fail_json(msg="Error mounting %s: %s" % (name, msg)) module.fail_json(msg="Error mounting %s: %s" % (name, msg))
module.exit_json(changed=changed, **args) module.exit_json(changed=changed, **args)