Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mac_service failures on Big Sur. #58144

Merged
merged 12 commits into from Sep 30, 2020
Merged

Conversation

weswhet
Copy link
Collaborator

@weswhet weswhet commented Aug 6, 2020

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

@weswhet weswhet requested a review from a team as a code owner August 6, 2020 02:51
@ghost ghost requested review from garethgreenaway and removed request for a team August 6, 2020 02:52
@weswhet
Copy link
Collaborator Author

weswhet commented Aug 6, 2020

re-run m2crypto

@sheagcraig
Copy link
Collaborator

Looking good! Love seeing all the legacy python stuff slough away.

@weswhet
Copy link
Collaborator Author

weswhet commented Aug 15, 2020

re-run all

garethgreenaway
garethgreenaway previously approved these changes Aug 18, 2020
@weswhet
Copy link
Collaborator Author

weswhet commented Sep 29, 2020

@sagetherage can we get this into magnesium pretty please? This is the last piece for getting salt Big Sur ready :)

@sagetherage sagetherage added the Magnesium Mg release after Na prior to Al label Sep 29, 2020
@weswhet
Copy link
Collaborator Author

weswhet commented Sep 29, 2020

All Green 🟢 . @garethgreenaway can I get a re-review :)

garethgreenaway
garethgreenaway previously approved these changes Sep 29, 2020
@garethgreenaway
Copy link
Member

@weswhet Done. Thanks!

@sagetherage sagetherage added MacOS pertains to the OS of fruit Bug broken, incorrect, or confusing behavior severity-critical top severity, seen by most users, serious issues and removed severity-critical top severity, seen by most users, serious issues labels Sep 30, 2020
@sagetherage sagetherage added the severity-high 2nd top severity, seen by most users, causes major problems label Sep 30, 2020
@weswhet
Copy link
Collaborator Author

weswhet commented Sep 30, 2020

Had to fix conflicts for recent changes to master. Should be good as long as we don't get any more conflicts 😂

dwoz
dwoz approved these changes Sep 30, 2020
@dwoz dwoz merged commit 2cf321c into saltstack:master Sep 30, 2020
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug broken, incorrect, or confusing behavior MacOS pertains to the OS of fruit Magnesium Mg release after Na prior to Al severity-high 2nd top severity, seen by most users, causes major problems
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] mac_service module crashes on macOS Big Sur
6 participants