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

Merge pull request #1480 from dagwieers/command-fix2

Browse source 
Use return codes > 255 for Ansible-specific errors.
This commit is contained in:
Michael DeHaan 2012-10-30 05:04:44 -07:00
commit 86e744d658
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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(rc=255, msg="no command given") module.fail_json(rc=256, msg="no command given")
if chdir: if chdir:
os.chdir(os.path.expanduser(chdir)) os.chdir(os.path.expanduser(chdir))
@ -99,7 +99,7 @@ def main():
except (OSError, IOError), e: except (OSError, IOError), e:
module.fail_json(rc=e.errno, msg=str(e), cmd=args) module.fail_json(rc=e.errno, msg=str(e), cmd=args)
except: except:
module.fail_json(rc=254, msg=traceback.format_exc(), cmd=args) module.fail_json(rc=257, 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(rc=253, msg="cannot change to directory '%s': path does not exist" % v) self.fail_json(rc=258, msg="cannot change to directory '%s': path does not exist" % v)
elif v[0] != '/': elif v[0] != '/':
self.fail_json(rc=252, msg="the path for 'chdir' argument must be fully qualified") self.fail_json(rc=259, 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