Include Big Sur vers "11" in mac_softwareupdate modern pattern condition#58247
Conversation
ghost
requested review from
It may be unrelated, but tests were failing when they didn't have the osmajorrelease grain. This module should only be available on macOS where that grain _does_ exist, but there's no harm in just using osrelease_info like the second half of the condition.
|
Looks great! Thanks, @sheagcraig! |
|
Howdy @twangboy! |
|
@sagetherage could we tag this for 3001.2 (assuming that's a thing) |
@weswhet Sure, for whatever release comes next? Will do! Right now, the next release is |
sagetherage
added
Magnesium
@sheagcraig could you open an issue for backlog tracking? @sagetherage yeah whatever is the next release would be great. Would love to get as much Big Sur support in as close to its release as possible. Per usual Thank you! Thank you! 😃 |
|
@weswhet should we create a Mac team in GitHub to review PRs? I am working on permissions to get more access to that, but today I could do that with people in the MacOS Working Group and then assign that team as a reviewers - just a thought. Maybe discuss at the next WG meeting? |
|
@sheagcraig Looks great. Can you add a changelog file for this change? Thanks! |
|
There you go @garethgreenaway |
|
@sheagcraig Awesome. thanks! |
|
@sheagcraig thank you for the PR it's awesome! I just have one question about Mac OS versioning because I'm not a Mac OS guru. |
6 participants
What does this PR do?
Apparently Apple is using both "10.16" and "11" for versioning Big Sur, depending on where you look. The mac_softwareupdate module uses a different regex depending on OS version, and the determination was based on the osrelease_info grain. This results in a Big Sur machine not using the correct regex;
osrelease_info[1]is0for Big Sur.This PR simply adds an additional clause to the if statement to handle
osmajorrelease > 10.What issues does this PR fix or reference?
Fixes:
Previous Behavior
New Behavior
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes