Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unreachable ssh-id-wrapper template when root_dir is relative #48545

Merged
merged 1 commit into from
Aug 21, 2018
Merged

Fix unreachable ssh-id-wrapper template when root_dir is relative #48545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions salt/modules/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down