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

Dynamically determine valid Seed Program names and provide better error message if an unknown Seed Program is given to --seedprogram

Browse Source
This commit is contained in:
Greg Neagle 2019-02-19 11:34:51 -08:00
parent c0cdf39725
commit 7b16cf5d39
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installinstallmacos.py
View File

@ -73,6 +73,15 @@ def get_seed_catalog(seedname='DeveloperSeed'):
return ''
def get_seeding_programs():
'''Returns the list of seeding program names'''
try:
seed_catalogs = plistlib.readPlist(SEED_CATALOGS_PLIST)
return seed_catalogs.keys()
except (OSError, ExpatError, AttributeError, KeyError):
return ''
def get_default_catalog():
'''Returns the default softwareupdate catalog for the current OS'''
darwin_major = os.uname()[2].split('.')[0]
@ -401,7 +410,7 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument('--seedprogram', default='',
help='Which Seed Program catalog to use. Valid values '
'are CustomerSeed, DeveloperSeed, and PublicSeed.')
'are %s.' % ', '.join(get_seeding_programs()))
parser.add_argument('--catalogurl', default='',
help='Software Update catalog URL. This option '
'overrides any seedprogram option.')
@ -431,6 +440,9 @@ def main():
print >> sys.stderr, (
'Could not find a catalog url for seed program %s'
% args.seedprogram)
print >> sys.stderr, (
'Valid seeding programs are: %s'
% ', '.join(get_seeding_programs()))
exit(-1)
else:
su_catalog_url = get_default_catalog()