Skip to content
Snippets Groups Projects
Commit f17f5ff2 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-13792: Merge 'brad/viewer-manifest-codesign-fix' into sl-17079

parents 9d7f8156 2cbc3e53
No related branches found
No related tags found
No related merge requests found
...@@ -1313,9 +1313,8 @@ def package_finish(self): ...@@ -1313,9 +1313,8 @@ def package_finish(self):
] ]
for attempt in range(3): for attempt in range(3):
if attempt: # second or subsequent iteration if attempt: # second or subsequent iteration
print >> sys.stderr, \ print("codesign failed, waiting {:d} seconds before retrying".format(sign_retry_wait),
("codesign failed, waiting %d seconds before retrying" % file=sys.stderr)
sign_retry_wait)
time.sleep(sign_retry_wait) time.sleep(sign_retry_wait)
sign_retry_wait*=2 sign_retry_wait*=2
...@@ -1345,7 +1344,7 @@ def package_finish(self): ...@@ -1345,7 +1344,7 @@ def package_finish(self):
# 'err' goes out of scope # 'err' goes out of scope
sign_failed = err sign_failed = err
else: else:
print >> sys.stderr, "Maximum codesign attempts exceeded; giving up" print("Maximum codesign attempts exceeded; giving up", file=sys.stderr)
raise sign_failed raise sign_failed
self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg]) self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg])
self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg]) self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment