projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a25b222
)
Try to fix notarization when an upload has already happened.
author
Carl Hetherington
<cth@carlh.net>
Thu, 13 May 2021 14:22:31 +0000
(16:22 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 13 May 2021 14:22:31 +0000
(16:22 +0200)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index 7f5552230c5989bb16b9dd094a99a43b9478a78d..26a2ccf4b2285e54612d345842980b7f8a805ec4 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-748,6
+748,14
@@
def notarize_dmg(dmg, bundle_id):
return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
request_uuid = string_after(p, "RequestUUID")
return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
request_uuid = string_after(p, "RequestUUID")
+ if request_uuid is None:
+ print("Looking for upload ID")
+ message = string_after("message")
+ print("Looking in %s" % message)
+ if message:
+ m = re.match('.*The upload ID is ([0-9a-f\-]*)', message)
+ if m:
+ request_uuid = m.groups()[0]
if request_uuid is None:
print("Response: %s" % p)
raise Error('No RequestUUID found in response from Apple')
if request_uuid is None:
print("Response: %s" % p)
raise Error('No RequestUUID found in response from Apple')