projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f9067c7
)
Fix handling of notarization request.
author
Carl Hetherington
<cth@carlh.net>
Tue, 20 Oct 2020 19:07:53 +0000
(21:07 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 20 Oct 2020 19:07:53 +0000
(21:07 +0200)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index 8ce2497fd3e474b898e89c5a2c31c5d8a43d8829..3bd001c60ea58ec46911b518103dc38486dc4151 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-734,14
+734,13
@@
def notarize(dmg, bundle_id):
def string_after(process, key):
lines = p.stdout.decode('utf-8').splitlines()
def string_after(process, key):
lines = p.stdout.decode('utf-8').splitlines()
- request_uuid = None
for i in range(0, len(lines)):
if lines[i].find(key) != -1:
return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
for i in range(0, len(lines)):
if lines[i].find(key) != -1:
return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
- raise Error("Missing expected response %s from Apple" % key)
-
request_uuid = string_after(p, "RequestUUID")
request_uuid = string_after(p, "RequestUUID")
+ if request_uuid is None:
+ raise Error('No RequestUUID found in response from Apple')
for i in range(0, 30):
print('Checking up on %s' % request_uuid)
for i in range(0, 30):
print('Checking up on %s' % request_uuid)