Fix shlexing of passthrough args. (cherrypick of #12547) #12550
Merged
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
`./pants run example.py -- -flag "some args"` currently results in a different `sys.argv` for the process than `./example.py -flag "some args"` would. This was because we were applying shlexing after the source/rank of an option had been discarded, which was too late to determine whether to shlex (flag/config/env values should be shlexed: passthrough arguments should not). Move `shell_str` `list` shlexing into `ListValueComponent` such that it is skipped when a `ListValueComponent` is manually constructed for passthrough args. One downside of this change is that list-value addition and subtraction will now apply to the shlexed tokens of a string, rather than to the entire string (i.e `+["some args"],-["args"]` will result in a final set of `["some"]`). But I expect that list subtraction is rare for `shell_str` args. [ci skip-rust] [ci skip-build-wheels]
Eric-Arellano
approved these changes
Aug 12, 2021
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.
./pants run example.py -- -flag "some args"currently results in a differentsys.argvfor the process than./example.py -flag "some args"would. This was because we were applying shlexing after the source/rank of an option had been discarded, which was too late to determine whether to shlex (flag/config/env values should be shlexed: passthrough arguments should not).Move
shell_strlistshlexing intoListValueComponentsuch that it is skipped when aListValueComponentis manually constructed for passthrough args.One downside of this change is that list-value addition and subtraction will now apply to the shlexed tokens of a string, rather than to the entire string (i.e
+["some args"],-["args"]will result in a final set of["some"]). But I expect that list subtraction is rare forshell_strargs.[ci skip-rust]
[ci skip-build-wheels]