a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't double dwim first_available_file in template

pull/4420/head
Daniel Hokka Zakrisson 2012-11-06 20:34:05 +01:00
parent 37bdee331c
commit 00aa584c57
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/runner/action_plugins/template.py
View File

@ -56,17 +56,17 @@ class ActionModule(object):
if 'first_available_file' in inject: if 'first_available_file' in inject:
found = False found = False
for fn in self.runner.module_vars.get('first_available_file'): for fn in self.runner.module_vars.get('first_available_file'):
fn = utils.template(self.runner.basedir, fn, inject) fnt = utils.template(self.runner.basedir, fn, inject)
fn = utils.path_dwim(self.runner.basedir, fn) fnd = utils.path_dwim(self.runner.basedir, fnt)
if os.path.exists(fn): if os.path.exists(fnd):
source = fn source = fnt
found = True found = True
break break
if not found: if not found:
result = dict(failed=True, msg="could not find src in first_available_file list") result = dict(failed=True, msg="could not find src in first_available_file list")
return ReturnData(conn=conn, comm_ok=False, result=result) return ReturnData(conn=conn, comm_ok=False, result=result)
else:
source = utils.template(self.runner.basedir, source, inject) source = utils.template(self.runner.basedir, source, inject)
# template the source data locally & transfer # template the source data locally & transfer
try: try: