ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-06 09:11:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'winrm_v2_fixes' of https://github.com/cchurch/ansible into cchurch-winrm_v2_fixes

Browse source
This commit is contained in:
James Cammarata 2015-07-30 13:26:48 -04:00
commit 2a93559fc8
25 changed files with 356 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ class ActionModule(ActionBase):
# Check if the source ends with a "/"
source_trailing_slash = False
if source:
source_trailing_slash = source.endswith(os.sep)
source_trailing_slash = self._connection._shell.path_has_trailing_slash(source)
# Define content_tempfile in case we set it after finding content populated.
content_tempfile = None
@ -182,7 +182,7 @@ class ActionModule(ActionBase):
continue
# Define a remote directory that we will copy the file to.
tmp_src = tmp + 'source'
tmp_src = self._connection._shell.join_path(tmp, 'source')
if not raw:
self._connection.put_file(source_full, tmp_src)