diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-02-01 11:19:22 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-02-01 11:19:22 -0500 |
| commit | e23d86ca4dbc0e481ddb183149dfcdd1dd6ddc0c (patch) | |
| tree | 9852d20ed9c50cec062f4125bc49ea16f42ed8ab /indra/newview | |
| parent | b7c4e27d5b973c02318559aaa6c5f029806794f2 (diff) | |
SL-13792: Cannot mix print statement and print function.
'from __future__ import print_function' not only makes the print() function
available, it also makes the Python 2 print statement invalid syntax. Until we
merge with the Python 3 branch (soon!), don't import print_function: instead
revert to 'print >> sys.stderr' statements.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 55f168d9a3..a7a6a01d28 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -26,8 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA $/LicenseInfo$ """ -from __future__ import print_function - import errno import glob import itertools @@ -1317,9 +1315,9 @@ class DarwinManifest(ViewerManifest): ] for attempt in range(3): if attempt: # second or subsequent iteration - print("codesign failed, waiting %d seconds before retrying" % - sign_retry_wait, - file=sys.stderr) + print >> sys.stderr, \ + ("codesign failed, waiting %d seconds before retrying" % + sign_retry_wait) time.sleep(sign_retry_wait) sign_retry_wait*=2 @@ -1349,7 +1347,7 @@ class DarwinManifest(ViewerManifest): # 'err' goes out of scope sign_failed = err else: - print("Maximum codesign attempts exceeded; giving up", file=sys.stderr) + print >> sys.stderr, "Maximum codesign attempts exceeded; giving up" 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]) |