wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure destination and source are available before mangling them

Browse source 
Fixes #1918.
This commit is contained in:
Daniel Hokka Zakrisson 2013-01-25 23:14:52 +01:00
parent 6f9099c51d
commit 4d71b31f7e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/runner/action_plugins/template.py
View file

@ -37,10 +37,6 @@ class ActionModule(object):
source = options.get('src', None)
dest = options.get('dest', None)
if dest.endswith("/"):
base = os.path.basename(source)
dest = os.path.join(dest, base)
if (source is None and 'first_available_file' not in inject) or dest is None:
result = dict(failed=True, msg="src and dest are required")
return ReturnData(conn=conn, comm_ok=False, result=result)
@ -62,6 +58,10 @@ class ActionModule(object):
else:
source = utils.template(self.runner.basedir, source, inject)
if dest.endswith("/"):
base = os.path.basename(source)
dest = os.path.join(dest, base)
# template the source data locally & transfer
try:
resultant = utils.template_from_file(self.runner.basedir, source, inject)