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

More tweaks to avoid changing the CatalogURL in 10.11+

Browse Source
This commit is contained in:
Greg Neagle
2016-07-21 09:05:22 -07:00
parent 03cce8efa9
commit a6aa65b52b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ class AppleUpdates(object):
# fix things if somehow we died last time before resetting the
# original CatalogURL
os_version_tuple = munkicommon.getOsVersion(as_tuple=True)
if os_version_tuple >= (10, 9):
if os_version_tuple in [(10, 9), (10, 10)]:
self._ResetOriginalCatalogURL()
real_cache_dir = os.path.join(self._managed_install_dir, 'swupd')
@@ -1341,7 +1341,7 @@ class AppleUpdates(object):
# OS version-specific stuff to use a specific CatalogURL
if os_version_tuple < (10, 9):
cmd.extend(['--CatalogURL', catalog_url])
else:
elif os_version_tuple in [(10, 9), (10, 10)]:
self._SetCustomCatalogURL(catalog_url)
cmd.extend(options_list)
@@ -1448,7 +1448,7 @@ class AppleUpdates(object):
if catalog_url:
# reset CatalogURL if needed
if os_version_tuple >= (10, 9):
if os_version_tuple in [(10, 9), (10, 10)]:
self._ResetOriginalCatalogURL()
retcode = job.returncode()