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

Merge branch 'Munki5dev' into new-msc-design

Browse Source
This commit is contained in:
Greg Neagle
2020-09-04 08:29:57 -07:00
parent 4b33ef1f41 a840bed778
commit d77e393b78
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/appleupdates/su_tool.py
+6 -1
View File
@@ -262,13 +262,18 @@ def run(options_list, catalog_url=None, stop_allowed=False):
continue
# other output
if output.startswith('Progress: '):
if output.startswith(('Progress: ', 'downloading: ', 'preparing: ')):
# Snow Leopard/Lion progress info with '-v' flag
# Big Sur has 'downloading' percent-done
try:
percent = int(output[10:].rstrip('%'))
except ValueError:
percent = -1
display.display_percent_done(percent, 100)
if output.startswith('downloading: '):
display.display_status_minor('Downloading...')
if output.startswith('downloading: '):
display.display_status_minor('Preparing...')
continue
if output.startswith('Software Update Tool'):
# don't display this
code/client/munkilib/appleupdates/sync.py
+9 -1
View File
@@ -28,6 +28,7 @@ import subprocess
import time
import xattr
# pylint: disable=ungrouped-imports
try:
# Python 2
from urllib2 import quote, unquote
@@ -40,6 +41,7 @@ try:
except ImportError:
# Python 3
from urllib.parse import urlsplit
# pylint: enable=ungrouped-imports
# PyLint cannot properly find names inside Cocoa libraries, so issues bogus
@@ -88,7 +90,13 @@ DEFAULT_CATALOG_URLS = {
'snowleopard-leopard.merged-1.sucatalog'),
'10.15': ('https://swscan.apple.com/content/catalogs/others/'
'index-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-'
'lion-snowleopard-leopard.merged-1.sucatalog')
'lion-snowleopard-leopard.merged-1.sucatalog'),
'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-'
'mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'),
}
# Preference domain for Apple Software Update.