fix git wrapper #29069
Merged
fix git wrapper #29069
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @abadger |
ansibot
added
affects_2.4
ansibot
removed
the
needs_triage
|
@plamer ping, are you able to test this? I'd like to see this go into 2.4.0 for which rc1 has already gone out. So we're closing in on the time when we'd have to punt this to a later release. |
sivel
reviewed
Sep 8, 2017
| 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"] = ' '.join([os.environ.get('SHELL', '/bin/sh'), ssh_wrapper]) |
There was a problem hiding this comment.
The join here seems a little unnecessary, and the performance is worse than a printf like string format or using .format
Although it is just 1 line, and not repeated, so that's just a little bit of a nitpick.
There was a problem hiding this comment.
Updated to use percent formatting
robinro
reviewed
Sep 10, 2017
| @@ -371,9 +371,10 @@ def write_ssh_wrapper(): | |||
|
|
|||
| def set_git_ssh(ssh_wrapper, key_file, ssh_opts): | |||
|
|
|||
| if os.environ.get("GIT_SSH"): | |||
| del os.environ["GIT_SSH"] | |||
| # git_ssh_command will override git_ssh, so only older git needs it | |||
There was a problem hiding this comment.
As far as I see GIT_SSH_COMMAND was only introduced in git 2.3, so this change will not fix the issue on many systems, including rhel7.
prasadkatti
pushed a commit
to prasadkatti/ansible
that referenced
this pull request
Oct 1, 2017
* fix git wrapper * fallback to bin/sh * Use percent formatting as per sivel's review
bcoca
added a commit
to bcoca/ansible
that referenced
this pull request
Oct 4, 2017
This reverts commit f8005d2. fix needs to be rethought as it applies to only newer git versions and use of env shell breaks with non 'bourne compatible' shells
abadger
pushed a commit
that referenced
this pull request
Oct 4, 2017
This reverts commit f8005d2. fix needs to be rethought as it applies to only newer git versions and use of env shell breaks with non 'bourne compatible' shells
BondAnthony
pushed a commit
to BondAnthony/ansible
that referenced
this pull request
Oct 5, 2017
* fix git wrapper * fallback to bin/sh * Use percent formatting as per sivel's review
ansibot
added
bug
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Fixes issue with git on noexec when forced to use the ssh wrapper it can write on demand.
ISSUE TYPE
COMPONENT NAME
git
ANSIBLE VERSION