[stable-2.7] Add work-around for scp issue in tests.

(cherry picked from commit 414ac12ddd)

Co-authored-by: Matt Clay <matt@mystile.com>
pull/58235/head
Matt Clay 6 years ago committed by Toshio Kuratomi
parent a9288b3c53
commit 4f1ea957bc

@ -2,9 +2,22 @@
set -eux
# temporary work-around for issues due to new scp filename checking
# https://github.com/ansible/ansible/issues/52640
if [[ "$(scp -T 2>&1)" == "usage: scp "* ]]; then
# scp supports the -T option
# work-around required
scp_args=("-e" "ansible_scp_extra_args=-T")
else
# scp does not support the -T option
# no work-around required
# however we need to put something in the array to keep older versions of bash happy
scp_args=("-e" "")
fi
# sftp
./posix.sh "$@"
# scp
ANSIBLE_SCP_IF_SSH=true ./posix.sh "$@"
ANSIBLE_SCP_IF_SSH=true ./posix.sh "$@" "${scp_args[@]}"
# piped
ANSIBLE_SSH_TRANSFER_METHOD=piped ./posix.sh "$@"

Loading…
Cancel
Save