External/macadmin-scripts
1
0
Fork 0
mirror of https://github.com/grahampugh/macadmin-scripts.git synced 2025-12-17 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert Python 3 chnages since they relied on a non-standard module.

Browse Source 
This reverts commit adcff204f460bf5a977798661572947d29637a88.
This commit is contained in:
Greg Neagle 2019-05-02 17:19:18 -07:00
parent adcff204f4
commit c7c3ab6c31
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installinstallmacos.py
View File

@ -67,7 +67,7 @@ def get_seeding_program(sucatalog_url):
'''Returns a seeding program name based on the sucatalog_url''' '''Returns a seeding program name based on the sucatalog_url'''
try: try:
seed_catalogs = plistlib.readPlist(SEED_CATALOGS_PLIST) seed_catalogs = plistlib.readPlist(SEED_CATALOGS_PLIST)
for key, value in seed_catalogs.items(): for key, value in list(seed_catalogs.items()):
if sucatalog_url == value: if sucatalog_url == value:
return key return key
return '' return ''
@ -341,7 +341,8 @@ def find_mac_os_installers(catalog):
installers''' installers'''
mac_os_installer_products = [] mac_os_installer_products = []
if 'Products' in catalog: if 'Products' in catalog:
for product_key in catalog['Products'].keys(): product_keys = list(catalog['Products'].keys())
for product_key in product_keys:
product = catalog['Products'][product_key] product = catalog['Products'][product_key]
try: try:
if product['ExtendedMetaInfo'][ if product['ExtendedMetaInfo'][