Template options sooner on complex args copy

This commit is contained in:
Michael DeHaan 2013-03-07 00:35:40 -05:00
parent 2bb305f6d5
commit ffbd4b5a2c

View file

@ -36,9 +36,9 @@ class ActionModule(object):
if complex_args: if complex_args:
options.update(complex_args) options.update(complex_args)
options.update(utils.parse_kv(module_args)) options.update(utils.parse_kv(module_args))
options = utils.template(self.runner.basedir, options, inject)
source = options.get('src', None) source = options.get('src', None)
dest = options.get('dest', None) dest = options.get('dest', None)
options = utils.template(self.runner.basedir, options, inject)
module_args = self.runner._complex_args_hack(options, '') module_args = self.runner._complex_args_hack(options, '')
if (source is None and not 'first_available_file' in inject) or dest is None: if (source is None and not 'first_available_file' in inject) or dest is None: