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

Some post-2to3-conversion cleanup

Browse Source
This commit is contained in:
Greg Neagle 2019-05-02 20:34:37 -07:00
parent c6c91dca06
commit 22c91ee3c8
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
installinstallmacos.py
View File

@ -129,8 +129,8 @@ def make_compressed_dmg(app_path, diskimagepath):
"""Returns path to newly-created compressed r/o disk image containing """Returns path to newly-created compressed r/o disk image containing
Install macOS.app""" Install macOS.app"""
print(('Making read-only compressed disk image containing %s...' print('Making read-only compressed disk image containing %s...'
% os.path.basename(app_path))) % os.path.basename(app_path))
cmd = ['/usr/bin/hdiutil', 'create', '-fs', 'HFS+', cmd = ['/usr/bin/hdiutil', 'create', '-fs', 'HFS+',
'-srcfolder', app_path, diskimagepath] '-srcfolder', app_path, diskimagepath]
try: try:
@ -265,8 +265,7 @@ def get_server_metadata(catalog, product_key, workdir, ignore_cache=False):
url, root_dir=workdir, ignore_cache=ignore_cache) url, root_dir=workdir, ignore_cache=ignore_cache)
return smd_path return smd_path
except ReplicationError as err: except ReplicationError as err:
print(( print('Could not replicate %s: %s' % (url, err), file=sys.stderr)
'Could not replicate %s: %s' % (url, err)), file=sys.stderr)
return None return None
except KeyError: except KeyError:
print('Malformed catalog.', file=sys.stderr) print('Malformed catalog.', file=sys.stderr)
@ -404,9 +403,8 @@ def replicate_product(catalog, product_id, workdir, ignore_cache=False):
replicate_url(package['MetadataURL'], root_dir=workdir, replicate_url(package['MetadataURL'], root_dir=workdir,
ignore_cache=ignore_cache) ignore_cache=ignore_cache)
except ReplicationError as err: except ReplicationError as err:
print(( print('Could not replicate %s: %s'
'Could not replicate %s: %s' % (package['MetadataURL'], err), file=sys.stderr)
% (package['MetadataURL'], err)), file=sys.stderr)
exit(-1) exit(-1)
@ -455,12 +453,10 @@ def main():
elif args.seedprogram: elif args.seedprogram:
su_catalog_url = get_seed_catalog(args.seedprogram) su_catalog_url = get_seed_catalog(args.seedprogram)
if not su_catalog_url: if not su_catalog_url:
print(( print('Could not find a catalog url for seed program %s'
'Could not find a catalog url for seed program %s' % args.seedprogram, file=sys.stderr)
% args.seedprogram), file=sys.stderr) print('Valid seeding programs are: %s'
print(( % ', '.join(get_seeding_programs()), file=sys.stderr)
'Valid seeding programs are: %s'
% ', '.join(get_seeding_programs())), file=sys.stderr)
exit(-1) exit(-1)
else: else:
su_catalog_url = get_default_catalog() su_catalog_url = get_default_catalog()