From 4d956afb178cc3e7d81066250a0628b5801824bc Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 9 Mar 2022 10:11:40 -0800
Subject: Fix DRTVWR-550 TeamCity build. codesigning retry block had some
leftover python2 syntax
---
indra/newview/viewer_manifest.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ae3ed56b3d..1809b707ef 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1313,9 +1313,8 @@ class DarwinManifest(ViewerManifest):
]
for attempt in range(3):
if attempt: # second or subsequent iteration
- print >> sys.stderr, \
- ("codesign failed, waiting %d seconds before retrying" %
- sign_retry_wait)
+ print("codesign failed, waiting {:d} seconds before retrying".format(sign_retry_wait),
+ file=sys.stderr)
time.sleep(sign_retry_wait)
sign_retry_wait*=2
--
cgit v1.2.3
From 2cbc3e530f3a34aaf75e0b4d6f4a16aeadeb90d8 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 9 Mar 2022 16:47:35 -0800
Subject: More DRTVWR-550 Teamcity build fix. another piece of python2 syntax
leftover in an error handling block
---
indra/newview/viewer_manifest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1809b707ef..c9aa82f7d4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1344,7 +1344,7 @@ class DarwinManifest(ViewerManifest):
# 'err' goes out of scope
sign_failed = err
else:
- print >> sys.stderr, "Maximum codesign attempts exceeded; giving up"
+ print("Maximum codesign attempts exceeded; giving up", file=sys.stderr)
raise sign_failed
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])
--
cgit v1.2.3