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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix when checking for service Label on macOS #50443

Merged
merged 1 commit into from Nov 9, 2018

Conversation

Projects
None yet
3 participants
@weswhet
Copy link
Contributor

commented Nov 8, 2018

What does this PR do?

Fixes an issue where the mac_utils module would try to process /System/Library/LaunchDaemons/com.apple.jetsamproperties.Mac.plist and fail when trying to access the Label Key that was introduced in #50228. This adds a try/except for it and logs accordingly.

What issues does this PR fix or reference?

Not currently in a public release.

Tests written?

Yes

Commits signed with GPG?

Yes

cc @sheagcraig (I got you bud 馃槈)

@Ch3LL

Ch3LL approved these changes Nov 9, 2018

@rallytime rallytime merged commit 450c99a into saltstack:develop Nov 9, 2018

11 checks passed

WIP Ready for review
Details
codeclimate All good!
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

rallytime added a commit that referenced this pull request Nov 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.