summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-10-14 01:38:16 +0200
committerCarl Hetherington <cth@carlh.net>2020-10-17 21:33:57 +0200
commit0c33799796be9d33f086d60c7d0e8e876d3f2d70 (patch)
tree48aa0c137afd761249d92a624b34fe5cb6a3eb2e
parent7d3a6c79250b5acdd0914883ef1b08f9a0c8ffe3 (diff)
Notarization fix.
-rwxr-xr-xcdist6
1 files changed, 3 insertions, 3 deletions
diff --git a/cdist b/cdist
index 28c174e..41b73d9 100755
--- a/cdist
+++ b/cdist
@@ -722,7 +722,7 @@ def notarize(dmg, bundle_id):
for i in range(0, 30):
print('Checking up on %s' % request_uuid)
- p = subprocess.run(['xcrun', 'altool', '--notarization-info', request_uuid, '-u', apple_id, '-p', apple_password, '--output-format', 'xml'], capture_output=True)
+ p = subprocess.run(['xcrun', 'altool', '--notarization-info', request_uuid, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'], capture_output=True)
status = string_after(p, 'Status')
print('Got %s' % status)
if status == 'invalid':
@@ -792,8 +792,8 @@ class OSXSingleTarget(OSXTarget):
for x in p:
if not isinstance(x, tuple):
raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
- if not no_notarize:
- notarize(x[0], x[1])
+ if not no_notarize:
+ notarize(x[0], x[1])
self._copy_packages(tree, [x[0] for x in p], output_dir)