Fix mac_service failures on Big Sur. #58144
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
ghost
requested review from
|
re-run m2crypto |
|
Looking good! Love seeing all the legacy python stuff slough away. |
|
re-run all |
garethgreenaway
previously approved these changes
Aug 18, 2020
|
@sagetherage can we get this into magnesium pretty please? This is the last piece for getting salt Big Sur ready :) |
|
All Green 🟢 . @garethgreenaway can I get a re-review :) |
garethgreenaway
previously approved these changes
Sep 29, 2020
|
@weswhet Done. Thanks! |
sagetherage
added
MacOS
sagetherage
added
the
severity-high
|
Had to fix conflicts for recent changes to master. Should be good as long as we don't get any more conflicts 😂 |
dwoz
approved these changes
Sep 30, 2020
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.
What does this PR do?
add in a ValueError catch for BigSur services and also removes py2 code.
What issues does this PR fix or reference?
Fixes: #58143
Previous Behavior
salt would crash on gathering available services.
New Behavior
salt is a happy camper.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes