mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel
This commit is contained in:
commit
a18f4b6230
3 changed files with 6 additions and 0 deletions
|
@ -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))
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue