ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-15 01:20:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

New tests for copy recursive with absolute paths

Browse source 
Absolute path trailing slash handling in absolute directories

find_needle() isn't passing a trailing slash through verbatim.  Since
copy uses that to determine if it should copy a directory or just the
files inside of it, we have to detect that and restore it after calling
find_needle()

Fixes #27439
This commit is contained in:
Toshio Kuratomi 2017-07-28 19:36:23 -07:00
parent 7cfd02097c
commit 0a2cdb2585
2 changed files with 94 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/action/copy.py
View file

@ -442,8 +442,14 @@ class ActionModule(ActionBase):
elif remote_src:
result.update(self._execute_module(task_vars=task_vars))
return result
else: # find in expected paths
else:
# find_needle returns a path that may not have a trailing slash on
# a directory so we need to determine that now (we use it just
# like rsync does to figure out whether to include the directory
# or only the files inside the directory
trailing_slash = source.endswith(os.path.sep)
try:
# find in expected paths
source = self._find_needle('files', source)
except AnsibleError as e:
result['failed'] = True
@ -451,6 +457,12 @@ class ActionModule(ActionBase):
result['exception'] = traceback.format_exc()
return result
if trailing_slash != source.endswith(os.path.sep):
if source[-1] == os.path.sep:
source = source[:-1]
else:
source = source + os.path.sep
# A list of source file tuples (full_path, relative_path) which will try to copy to the destination
source_files = {'files': [], 'directories': [], 'symlinks': []}