saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #48545 from bbinet/fix-unreacheable-ssh-id-wrapper

Browse source 
Fix unreachable ssh-id-wrapper template when root_dir is relative
This commit is contained in:
Mike Place 2018-08-21 09:12:00 -06:00 • committed by GitHub
commit 60605f0248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/git.py
View file

@ -265,10 +265,10 @@ def _git_run(command, cwd=None, user=None, password=None, identity=None,
# copy wrapper to area accessible by ``runas`` user
# currently no support in windows for wrapping git ssh
ssh_id_wrapper = os.path.join(
ssh_id_wrapper = os.path.abspath(os.path.join(
salt.utils.templates.TEMPLATE_DIRNAME,
'git/ssh-id-wrapper'
)
))
tmp_ssh_wrapper = None
if salt.utils.platform.is_windows():
ssh_exe = _find_ssh_exe()