Fix traceback on salt-ssh -h #36888
Merged
Fix traceback on salt-ssh -h #36888
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
This code was originally added to the option parser in 423a356. It was probably intended to be a single string continued onto multiple lines via parenthesis, but the use of a comma turns this into a tuple, which causes a traceback when "salt-ssh -h" is run.
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Oct 13, 2016
* upstream/develop: (39 commits) add option to force a reauth for a docker registry (saltstack#36893) Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (saltstack#36875) Adjust linux_acl unit test argument ordering Try to get SDB profile from pillar (saltstack#36934) doc: document what the argument of salt --subset means (saltstack#36943) - acl.delfacl: fix position of -X option to setfacl Revert change in default value for top_file_merging_strategy (saltstack#36922) modules/apk.py: Ensure we don't error on version extraction (saltstack#36921) Add FreeBSD and SmartOS to RC packages list (saltstack#36916) smbios.get should handle missing /dev/mem to not have useless grains (saltstack#36909) Properly handle "shared" arg in git.init when it is a bool (saltstack#36912) Pass through port as int and not str (saltstack#36910) Handle missing cache data a little more gracefully (saltstack#36908) modules: debian_ip: override params early to fix diff (saltstack#36820) states.schedule: splay is not ordereddict (saltstack#36894) Check for test=True in salt.wait_for_event orchestration events (saltstack#36897) Fix traceback on "salt-ssh -h" (saltstack#36888) salt-ssh: Try "command -v" before falling back to "which" (saltstack#36889) Update list of RC build platforms, fix example (saltstack#36887) Fix KeyError when loading runit execution module (saltstack#36882) ...
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.
This code was originally added to the option parser in 423a356. It was
probably intended to be a single string continued onto multiple lines
via parenthesis, but the use of a comma turns this into a tuple, which
causes a traceback when
salt-ssh -his run.