Revert back to having a default shell #68448
Open
+529
−246
Conversation
This file contains hidden or 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
bdrx312
reviewed
Nov 4, 2025
bdrx312
reviewed
Nov 4, 2025
bdrx312
reviewed
Nov 4, 2025
|
Is this a fix to #68298 ? If yes, thanks, as this regression has broken some code of mine. |
bdrx312
reviewed
Nov 4, 2025
twangboy
force-pushed
the
default_shell
branch
from
140dcca to
7c54899
Compare
twangboy
force-pushed
the
default_shell
branch
from
efd8eac to
0d74b92
Compare
twangboy
force-pushed
the
default_shell
branch
from
0d74b92 to
93a2044
Compare
bdrx312
reviewed
Nov 12, 2025
| if ( | ||
| python_shell is not True | ||
| and shell is not None | ||
| and not salt.utils.platform.is_windows() |
Contributor
There was a problem hiding this comment.
You updated utils.shlex_split to work with windows, so I think this and not salt.utils.platform.is_windows() should be removed.
bdrx312
reviewed
Nov 12, 2025
Comment on lines
+1620
to
+1623
| if "python_shell" in kwargs: | ||
| python_shell = kwargs.pop("python_shell") | ||
| else: | ||
| python_shell = False | ||
| python_shell = True |
Contributor
There was a problem hiding this comment.
Maybe just python_shell = kwargs.pop("python_shell", True)
bdrx312
reviewed
Nov 12, 2025
| """ | ||
| if isinstance(s, str): | ||
| return shlex.split(s, **kwargs) | ||
| if sys.platform == "win32": |
Contributor
There was a problem hiding this comment.
Should this use salt.utils.platform.is_windows() instead?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What does this PR do?
Reverts part of #68156 that changed the default behavior for
python_shellandshell. Also fixes a bug in the PR mentioned above, where you couldn't pass non-list parameters to a script.What issues does this PR fix or reference?
Fixes #68156
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes