have to always run dwim() on the path to get the full absolute path.

Fixes #14944
pull/15167/head
Toshio Kuratomi 9 years ago
parent dc9cce2c94
commit 0cabd133ba

@ -30,18 +30,17 @@ from ansible import constants as C
class ActionModule(ActionBase): class ActionModule(ActionBase):
def _get_absolute_path(self, path): def _get_absolute_path(self, path):
if self._task._role is not None: original_path = path
original_path = path
if self._task._role is not None: if self._task._role is not None:
path = self._loader.path_dwim_relative(self._task._role._role_path, 'files', path) path = self._loader.path_dwim_relative(self._task._role._role_path, 'files', path)
else: else:
path = self._loader.path_dwim_relative(self._loader.get_basedir(), 'files', path) path = self._loader.path_dwim_relative(self._loader.get_basedir(), 'files', path)
if original_path and original_path[-1] == '/' and path[-1] != '/': if original_path and original_path[-1] == '/' and path[-1] != '/':
# make sure the dwim'd path ends in a trailing "/" # make sure the dwim'd path ends in a trailing "/"
# if the original path did # if the original path did
path += '/' path += '/'
return path return path

Loading…
Cancel
Save