mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-03-10 19:45:18 +01:00
Compare commits
1 commit
7540f7c4c2
...
f08770dd5c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f08770dd5c |
2 changed files with 4 additions and 7 deletions
|
|
@ -1,2 +0,0 @@
|
||||||
trivial:
|
|
||||||
- synchronize - instantiate the connection plugin without the ``new_stdin`` argument, which is deprecated in ansible-core 2.15 (https://github.com/ansible-collections/ansible.posix/pull/421).
|
|
||||||
|
|
@ -284,6 +284,9 @@ class ActionModule(ActionBase):
|
||||||
# told (via delegate_to) that a different host is the source of the
|
# told (via delegate_to) that a different host is the source of the
|
||||||
# rsync
|
# rsync
|
||||||
if not use_delegate and remote_transport:
|
if not use_delegate and remote_transport:
|
||||||
|
# Create a connection to localhost to run rsync on
|
||||||
|
new_stdin = self._connection._new_stdin
|
||||||
|
|
||||||
# Unlike port, there can be only one shell
|
# Unlike port, there can be only one shell
|
||||||
localhost_shell = None
|
localhost_shell = None
|
||||||
for host in C.LOCALHOST:
|
for host in C.LOCALHOST:
|
||||||
|
|
@ -312,11 +315,7 @@ class ActionModule(ActionBase):
|
||||||
localhost_executable = C.DEFAULT_EXECUTABLE
|
localhost_executable = C.DEFAULT_EXECUTABLE
|
||||||
self._play_context.executable = localhost_executable
|
self._play_context.executable = localhost_executable
|
||||||
|
|
||||||
try:
|
new_connection = connection_loader.get('local', self._play_context, new_stdin)
|
||||||
new_connection = connection_loader.get('local', self._play_context)
|
|
||||||
except TypeError:
|
|
||||||
# Needed for ansible-core < 2.15
|
|
||||||
new_connection = connection_loader.get('local', self._play_context, self._connection._new_stdin)
|
|
||||||
self._connection = new_connection
|
self._connection = new_connection
|
||||||
# Override _remote_is_local as an instance attribute specifically for the synchronize use case
|
# Override _remote_is_local as an instance attribute specifically for the synchronize use case
|
||||||
# ensuring we set local tmpdir correctly
|
# ensuring we set local tmpdir correctly
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue