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

Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel

Browse source
This commit is contained in:
James Cammarata 2014-05-09 00:31:39 -05:00
commit 7faf766305
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/copy
View file

@ -204,6 +204,8 @@ def main():
os.unlink(dest) os.unlink(dest)
open(dest, 'w').close() open(dest, 'w').close()
if validate: if validate:
if "%s" not in validate:
module.fail_json(msg="validate must contain %%s: %s" % (validate))
(rc,out,err) = module.run_command(validate % src) (rc,out,err) = module.run_command(validate % src)
if rc != 0: if rc != 0:
module.fail_json(msg="failed to validate: rc:%s error:%s" % (rc,err)) module.fail_json(msg="failed to validate: rc:%s error:%s" % (rc,err))

2
files/lineinfile
View file

@ -154,6 +154,8 @@ def write_changes(module,lines,dest):
validate = module.params.get('validate', None) validate = module.params.get('validate', None)
valid = not validate valid = not validate
if validate: if validate:
if "%s" not in validate:
module.fail_json(msg="validate must contain %%s: %s" % (validate))
(rc, out, err) = module.run_command(validate % tmpfile) (rc, out, err) = module.run_command(validate % tmpfile)
valid = rc == 0 valid = rc == 0
if rc != 0: if rc != 0:

2
files/replace
View file

@ -90,6 +90,8 @@ def write_changes(module,contents,dest):
validate = module.params.get('validate', None) validate = module.params.get('validate', None)
valid = not validate valid = not validate
if validate: if validate:
if "%s" not in validate:
module.fail_json(msg="validate must contain %%s: %s" % (validate))
(rc, out, err) = module.run_command(validate % tmpfile) (rc, out, err) = module.run_command(validate % tmpfile)
valid = rc == 0 valid = rc == 0
if rc != 0: if rc != 0: