Handle merging of string key_filename values from connect_kwargs #1924
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
Specifying a string value for connect_kwargs["key_filename"], as described in Connection's docstring, fails when this value is merged with a value from config.connect_kwargs or ssh_config. Convert string values to the list form that resolve_connect_kwargs assumes.
kyleam
added a commit
to kyleam/niceman
that referenced
this pull request
Jan 7, 2019
A string is an acceptable form [*], but using a string rather than a list leads to an error when fabric merges a configured IdentityFile value from ssh_config (a fix is proposed in fabric/fabric#1924). [*] http://docs.fabfile.org/en/2.4/api/connection.html#connect-kwargs-arg
|
Cherry picked to 2.6 and up, then put a bunch of my own changes on top since this only fixed a single facet of the overall sloppiness in the relevant method 😇 it is much cleaner now. thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Specifying a string value for connect_kwargs["key_filename"], as
described in Connection's docstring, fails when this value is merged
with a value from config.connect_kwargs or ssh_config. Convert string
values to the list form that resolve_connect_kwargs assumes.
I've used the 2.0 branch as the base because that's the default branch. Please let me know if it'd be better to use master.