mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-03 02:40:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into universal2

Browse Source
This commit is contained in:
Greg Neagle
2020-12-14 14:34:18 -08:00
parent a2fde07886 49625ed975
commit c9f74aed6d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/appleupdates/sync.py
+8 -3
View File
@@ -94,8 +94,8 @@ DEFAULT_CATALOG_URLS = {
'10.16': ('https://swscan.apple.com/content/catalogs/others/'
'index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-'
'mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'),
'11.0': ('https://swscan.apple.com/content/catalogs/others/'
'index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-'
'11': ('https://swscan.apple.com/content/catalogs/others/'
'index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-'
'mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'),
}
@@ -214,11 +214,16 @@ class AppleUpdateSync(object):
# Finally, fall back to using a hard-coded url in DEFAULT_CATALOG_URLS.
os_version = osutils.getOsVersion()
catalog_url = DEFAULT_CATALOG_URLS.get(os_version, None)
if catalog_url:
return catalog_url
# didn't find a catalog, try only major os version (as in '11'):
os_version = os_version.split('.')[0]
catalog_url = DEFAULT_CATALOG_URLS.get(os_version, None)
if catalog_url:
return catalog_url
raise CatalogNotFoundError(
'No default Software Update CatalogURL for: %s' % os_version)
'No default Software Update CatalogURL for macOS %s' % os_version)
def copy_downloaded_catalog(self, _open=open):
"""Copy the downloaded catalog to a new file, extracting if gzipped.