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

Merge pull request #2647 from bertvv/issue_2498

Browse source 
Also show stdout when validation fails. This fixes #2498
This commit is contained in:
Brian Coca 2016-03-17 08:49:39 -07:00
commit a268e5a119
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
files/copy.py
View file

@ -289,7 +289,7 @@ def main():
# os.path.exists() can return false in some # os.path.exists() can return false in some
# circumstances where the directory does not have # circumstances where the directory does not have
# the execute bit for the current user set, in # the execute bit for the current user set, in
# which case the stat() call will raise an OSError # which case the stat() call will raise an OSError
os.stat(os.path.dirname(dest)) os.stat(os.path.dirname(dest))
except OSError, e: except OSError, e:
if "permission denied" in str(e).lower(): if "permission denied" in str(e).lower():
@ -318,7 +318,7 @@ def main():
module.fail_json(msg="validate must contain %%s: %s" % (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", exit_status=rc, stdout=out, stderr=err)
if remote_src: if remote_src:
_, tmpdest = tempfile.mkstemp(dir=os.path.dirname(dest)) _, tmpdest = tempfile.mkstemp(dir=os.path.dirname(dest))
shutil.copy2(src, tmpdest) shutil.copy2(src, tmpdest)