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

Make sure we always return 'rc' from the command module

Browse source 
If this is not a certainty, playbooks will fail without an 'rc' and checking both if there is an rc, and whether the 'rc' is (not) 0 is very complicated. (especially because ${something.rc} will not be substituted and all that)
This commit is contained in:
Dag Wieers 2012-10-26 15:02:03 +02:00
parent cb612853fa
commit 336ab8a97b
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/command
View file

@ -84,7 +84,7 @@ def main():
args = module.params['args'] args = module.params['args']
if args.strip() == '': if args.strip() == '':
module.fail_json(msg="no command given") module.fail_json(rc=255, msg="no command given")
if chdir: if chdir:
os.chdir(os.path.expanduser(chdir)) os.chdir(os.path.expanduser(chdir))
@ -97,9 +97,9 @@ def main():
cmd = subprocess.Popen(args, shell=shell, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen(args, shell=shell, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = cmd.communicate() out, err = cmd.communicate()
except (OSError, IOError), e: except (OSError, IOError), e:
module.fail_json(cmd=args, msg=str(e)) module.fail_json(rc=e.errno, msg=str(e), cmd=args)
except: except:
module.fail_json(msg=traceback.format_exc()) module.fail_json(rc=254, msg=traceback.format_exc(), cmd=args)
endd = datetime.datetime.now() endd = datetime.datetime.now()
delta = endd - startd delta = endd - startd
@ -178,9 +178,9 @@ class CommandModule(AnsibleModule):
elif m.group(2) == "chdir": elif m.group(2) == "chdir":
v = os.path.expanduser(v) v = os.path.expanduser(v)
if not (os.path.exists(v) and os.path.isdir(v)): if not (os.path.exists(v) and os.path.isdir(v)):
self.fail_json(msg="cannot change to directory '%s': path does not exist" % v) self.fail_json(rc=253, msg="cannot change to directory '%s': path does not exist" % v)
elif v[0] != '/': elif v[0] != '/':
self.fail_json(msg="the path for 'chdir' argument must be fully qualified") self.fail_json(rc=252, msg="the path for 'chdir' argument must be fully qualified")
params['chdir'] = v params['chdir'] = v
args = r.sub("", args) args = r.sub("", args)
params['args'] = args params['args'] = args