Fix mac softwareupdate for catalina #56191
Conversation
ghost
requested a review
from 
|
@weswhet please to be checking for correctness in this 2020 we find ourselves in. |
|
LGTM. ✅ |
|
🎉 |
|
@Ch3LL I don't know what to do here; the lint error is from a file that isn't touched by this PR. |
|
you are totally right, i'll take a look at that |
|
@sheagcraig FWIW I think we've figured out the lint failure. I don't believe the tests are in any way related to your changes though |
|
Just looking over a handful of the ci/py2/macosoxmojave and ci/py2/amazon2 test failures, I agree; I don't think my changes have anything to do with this. I'll let someone else of course be the decider on that, as that's a lot of tests that I'm not familiar with to have to wade through. Please let me know what you find out! |
There was a problem hiding this comment.
@sheagcraig looks like tests are all passing!
@Ch3LL do you have any other issues with this PR?
|
@Ch3LL I just fixed the merge conflict that appeared; I guess I need a new review! Thanks! |
|
@sheagcraig The pre-commit needs to be addressed an the tests need to pass for this to make it into Sodium |
|
@dwoz should be good to go :) |
weswhet
force-pushed
the
fix_mac_softwareupdate_for_catalina
branch
from
c767045
to
24e7f87
Compare
|
I needed to squash all the commits into one as they weren't signed. @garethgreenaway mind having a look again? |
What does this PR do?
This PR fixes the
mac_softwareupdate.list_availablefunc to address changes in the output of the macOS/usr/sbin/softwareupdatetool. It handles two issues:This PR switches on OS version to determine which regular expression to use, while adding the ability to filter updates by the new "shut down" action.
This PR was already accepted as #54281, but I was asked to rebase against master. So here we are!
What issues does this PR fix or reference?
#54220
Previous Behavior
mac_softwareupdate.list_availablewould not find any available updates on Catalina.mac_softwareupdate.list_availablewas not able to filter forshut downtype updates.New Behavior
mac_softwareupdate.list_availablehas functional parity for the newer output format on Catalina.mac_softwareupdate.list_availablenow has an arg to filter forshut downtype updates.Tests written?
Yes
Commits signed with GPG?
No