Make sure dwim'd relative path ends in a "/" if the original does

Fixes #7296
pull/7304/head
James Cammarata 11 years ago
parent 537494c2d6
commit 4d118d1c72

@ -32,7 +32,12 @@ class ActionModule(object):
if 'vars' in self.inject: if 'vars' in self.inject:
if '_original_file' in self.inject['vars']: if '_original_file' in self.inject['vars']:
# roles # roles
original_path = path
path = utils.path_dwim_relative(self.inject['_original_file'], 'files', path, self.runner.basedir) path = utils.path_dwim_relative(self.inject['_original_file'], 'files', path, self.runner.basedir)
if original_path and original_path[-1] == '/' and path[-1] != '/':
# make sure the dwim'd path ends in a trailing "/"
# if the original path did
path += '/'
elif 'inventory_dir' in self.inject['vars']: elif 'inventory_dir' in self.inject['vars']:
# non-roles # non-roles
abs_dir = os.path.abspath(self.inject['vars']['inventory_dir']) abs_dir = os.path.abspath(self.inject['vars']['inventory_dir'])

Loading…
Cancel
Save