mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

No longer just warn under El Capitan+ if SoftwareUpdateServerURL is set -- instead, warn and _ignore_ the value.

Browse Source
This commit is contained in:
Greg Neagle
2016-07-21 08:56:05 -07:00
parent b3f1982d98
commit 03cce8efa9
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/client/munkilib/appleupdates.py
View File

@@ -238,8 +238,8 @@ class AppleUpdates(object):
if len(readmes):
html = readmes[0].firstChild.data
html_data = buffer(html.encode('utf-8'))
attributed_string, attributes = NSAttributedString.alloc(
).initWithHTML_documentAttributes_(html_data, None)
attributed_string, _ = NSAttributedString.alloc(
).initWithHTML_documentAttributes_(html_data, None)
firmware_alert_text = attributed_string.string()
return firmware_alert_text
return ''
@@ -759,7 +759,7 @@ class AppleUpdates(object):
os_version_tuple = munkicommon.getOsVersion(as_tuple=True)
if os_version_tuple >= (10, 11):
catalog_url = self._ElCapitanGetCatalogURL()
catalog_url = None
else:
catalog_url = self._GetAppleCatalogURL()
@@ -819,16 +819,6 @@ class AppleUpdates(object):
f.write(contents)
f.close()
def _ElCapitanGetCatalogURL(self):
"""Returns SoftwareUpdateServerURL set in Munki's preferences or None.
Works around an issue with catalog changes causing cached downloads to
be deleted."""
# pylint: disable=no-self-use
munkisuscatalog = munkicommon.pref('SoftwareUpdateServerURL')
if munkisuscatalog:
return munkisuscatalog
return None
def _GetAppleCatalogURL(self):
"""Returns the catalog URL of the Apple SU catalog for the current Mac.
@@ -1534,7 +1524,7 @@ class AppleUpdates(object):
# 10.11 seems not to like file:// URLs, and we don't really need
# to switch to a local file URL anyway since we now have the
# --no-scan option
catalog_url = self._ElCapitanGetCatalogURL()
catalog_url = None
else:
# use our filtered local catalog
if not os.path.exists(self.local_catalog_path):
@@ -1816,29 +1806,19 @@ def installAppleUpdates(only_unattended=False):
def appleSoftwareUpdatesAvailable(forcecheck=False, suppresscheck=False,
client_id='', forcecatalogrefresh=False):
"""Method for drop-in appleupdates replacement; see primary method docs."""
appleUpdatesObject = getAppleUpdatesInstance()
os_version_tuple = munkicommon.getOsVersion(as_tuple=True)
munkisuscatalog = munkicommon.pref('SoftwareUpdateServerURL')
appleUpdatesObject = getAppleUpdatesInstance()
if appleUpdatesObject.CatalogURLisManaged():
if os_version_tuple >= (10, 11):
if munkisuscatalog:
munkicommon.display_warning(
"softwareupdate's CatalogURL is managed via MCX or "
"profiles. Custom softwareupate catalog %s will be "
"ignored." % munkisuscatalog)
else:
if os_version_tuple >= (10, 11):
if munkisuscatalog:
munkicommon.display_warning(
"Cannot efficiently manage Apple Software updates because "
"softwareupdate's CatalogURL is managed via MCX or profiles. "
"You may see unexpected or undesirable results.")
else:
if os_version_tuple >= (10, 11) and munkisuscatalog:
munkicommon.display_warning(
"Setting SoftwareUpdateServerURL in Munki's preferences under "
"OS X 10.11 and later may result in poor performance of "
"Apple Software Updates via Munki. It is recommended to "
"remove this setting and use com.apple.SoftwareUpdate's "
'settings for CatalogURL.')
"Custom softwareupate catalog %s in Munki's preferences will "
"be ignored." % munkisuscatalog)
elif appleUpdatesObject.CatalogURLisManaged():
munkicommon.display_warning(
"Cannot efficiently manage Apple Software updates because "
"softwareupdate's CatalogURL is managed via MCX or profiles. "
"You may see unexpected or undesirable results.")
appleUpdatesObject.client_id = client_id
appleUpdatesObject.force_catalog_refresh = forcecatalogrefresh