mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-25 22:40:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed (again) appleupdates.GetSoftwareUpdatePref method to respect MCX

Browse Source
This commit is contained in:
Greg Neagle
2011-08-26 12:29:49 -07:00
parent 7264f20ac1
commit 957998c87d
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/appleupdates.py
+8 -8
View File
@@ -31,10 +31,11 @@ import urllib2
import urlparse
from Foundation import NSDate
from Foundation import CFPreferencesCopyValue
from Foundation import CFPreferencesCopyAppValue
#from Foundation import CFPreferencesCopyValue
from Foundation import CFPreferencesSetValue
from Foundation import CFPreferencesAppSynchronize
from Foundation import kCFPreferencesAnyUser
#from Foundation import kCFPreferencesAnyUser
from Foundation import kCFPreferencesCurrentUser
from Foundation import kCFPreferencesCurrentHost
@@ -53,7 +54,7 @@ DEFAULT_CATALOG_URLS = {
}
# Preference domain for Apple Software Update.
APPLE_SOFTWARE_UPDATE_PLIST = 'com.apple.SoftwareUpdate'
APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN = 'com.apple.SoftwareUpdate'
# Filename for results of softwareupdate -l -f <pathname>.
# This lists the currently applicable Apple updates in a
@@ -706,9 +707,8 @@ class AppleUpdates(object):
Args:
pref_name: str preference name to get.
"""
return CFPreferencesCopyValue(
pref_name, APPLE_SOFTWARE_UPDATE_PLIST,
kCFPreferencesAnyUser, kCFPreferencesCurrentHost)
return CFPreferencesCopyAppValue(
pref_name, APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN)
def _LeopardSetupSoftwareUpdateCheck(self):
"""Set defaults for root user and current host; needed for Leopard."""
@@ -719,9 +719,9 @@ class AppleUpdates(object):
}
for key, value in defaults.iteritems():
CFPreferencesSetValue(
key, value, APPLE_SOFTWARE_UPDATE_PLIST,
key, value, APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN,
kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
if not CFPreferencesAppSynchronize(APPLE_SOFTWARE_UPDATE_PLIST):
if not CFPreferencesAppSynchronize(APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN):
munkicommon.display_warning(
'Error setting com.apple.SoftwareUpdate ByHost preferences.')
tests/code/client/munkilib/appleupdates_test.py
+8 -9
View File
@@ -1450,14 +1450,13 @@ class TestAppleUpdates(mox.MoxTestBase):
def testGetSoftwareUpdatePref(self):
"""Tests GetSoftwareUpdatePref()."""
self.mox.StubOutWithMock(appleupdates, 'CFPreferencesCopyValue')
self.mox.StubOutWithMock(appleupdates, 'CFPreferencesCopyAppValue')
pref_name = 'foo'
expected_return = 'bar'
appleupdates.CFPreferencesCopyValue(
appleupdates.CFPreferencesCopyAppValue(
pref_name,
appleupdates.APPLE_SOFTWARE_UPDATE_PLIST,
appleupdates.kCFPreferencesAnyUser,
appleupdates.kCFPreferencesCurrentHost).AndReturn(expected_return)
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN
).AndReturn(expected_return)
self.mox.ReplayAll()
self.au.GetSoftwareUpdatePref(pref_name)
@@ -1470,21 +1469,21 @@ class TestAppleUpdates(mox.MoxTestBase):
self.mox.StubOutWithMock(appleupdates, 'CFPreferencesAppSynchronize')
appleupdates.CFPreferencesSetValue(
'AgreedToLicenseAgreement', True,
appleupdates.APPLE_SOFTWARE_UPDATE_PLIST,
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN,
appleupdates.kCFPreferencesCurrentUser,
appleupdates.kCFPreferencesCurrentHost).AndReturn(None)
appleupdates.CFPreferencesSetValue(
'AutomaticDownload', True,
appleupdates.APPLE_SOFTWARE_UPDATE_PLIST,
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN,
appleupdates.kCFPreferencesCurrentUser,
appleupdates.kCFPreferencesCurrentHost).AndReturn(None)
appleupdates.CFPreferencesSetValue(
'LaunchAppInBackground', True,
appleupdates.APPLE_SOFTWARE_UPDATE_PLIST,
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN,
appleupdates.kCFPreferencesCurrentUser,
appleupdates.kCFPreferencesCurrentHost).AndReturn(None)
appleupdates.CFPreferencesAppSynchronize(
appleupdates.APPLE_SOFTWARE_UPDATE_PLIST).AndReturn(None)
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN).AndReturn(None)
appleupdates.munkicommon.display_warning(
'Error setting com.apple.SoftwareUpdate ByHost preferences.')