internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix git wrapper (#29069)"

Browse Source 
This reverts commit f8005d2737.

fix needs to be rethought as it applies to only newer git versions
and use of env shell breaks with non 'bourne compatible' shells
This commit is contained in:
Brian Coca
2017-10-04 10:10:18 -04:00
committed by Toshio Kuratomi
parent a333f2e5b0
commit 6459bacb6b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/source_control/git.py
View File

@@ -371,10 +371,9 @@ fi
def set_git_ssh(ssh_wrapper, key_file, ssh_opts):
# git_ssh_command will override git_ssh, so only older git needs it
if os.environ.get("GIT_SSH"):
del os.environ["GIT_SSH"]
os.environ["GIT_SSH"] = ssh_wrapper
# using shell to avoid 'noexec' issues if module temp dir is located in such a mount
os.environ["GIT_SSH_COMMAND"] = '%s %s' % (os.environ.get('SHELL', '/bin/sh'), ssh_wrapper)
if os.environ.get("GIT_KEY"):
del os.environ["GIT_KEY"]