Merge pull request #13 from grahampugh/munki-master

Merge changes in from munki-master
This commit is contained in:
Graham Pugh 2019-11-07 14:22:16 -06:00 committed by GitHub
commit 9e8b2fa5e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -556,10 +556,6 @@ def main():
'from the Apple software catalog'
'\n')
if os.getuid() != 0:
sys.exit('This command requires root (to install packages), so please '
'run again with sudo or as root.')
parser = argparse.ArgumentParser()
parser.add_argument('--seedprogram', default='',
help='Which Seed Program catalog to use. Valid values '
@ -626,6 +622,10 @@ def main():
print('%-17s: %s' % ('OS Version', build_info[0]))
print('%-17s: %s\n' % ('Build ID', build_info[1]))
if os.getuid() != 0:
sys.exit('This command requires root (to install packages), so please '
'run again with sudo or as root.')
if args.catalogurl:
su_catalog_url = args.catalogurl
elif args.seedprogram: