Quick fix for first_available_file and roles

This commit is contained in:
Darryl Stoflet 2013-04-11 20:40:23 -07:00
parent a05361f515
commit c63207bf75
2 changed files with 5 additions and 4 deletions

View file

@ -55,10 +55,11 @@ class ActionModule(object):
if 'first_available_file' in inject:
found = False
for fn in inject.get('first_available_file'):
fn_orig = fn
fn = template.template(self.runner.basedir, fn, inject)
fn = utils.path_dwim(self.runner.basedir, fn)
if not os.path.exists(fn) and '_original_file' in inject:
fn = utils.path_dwim_relative(inject['_original_file'], 'files', fn, self.runner.basedir, check=False)
fn = utils.path_dwim_relative(inject['_original_file'], 'files', fn_orig, self.runner.basedir, check=False)
if os.path.exists(fn):
source = fn
found = True