diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-03-28 16:45:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-03-28 16:45:22 -0400 |
| commit | ae4f64eee717562c4dc207c0216bfdae80e23fa9 (patch) | |
| tree | 2df752cd05a2ad5cd17dca44b6b0772a99f0649b | |
| parent | a379f754f3e6ce9f7c3c227cef9648c697fd55d2 (diff) | |
| parent | f17f5ff2725ad0c70cc2ff5f65eb76c2a224a83c (diff) | |
SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index b15bc5527b..1f1ee45549 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3298,9 +3298,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>33ed1bb3e24fbd3462da04fb3e917e94</string> + <string>1dda5fb3bb649b0ab5a93f22df7cb11e</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94814/850320/viewer_manager-3.0.568552-darwin64-568552.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/96998/862110/viewer_manager-3.0.569958-darwin64-569958.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3322,9 +3322,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>2ad8e04965ac8bddb7d351abe09bee07</string> + <string>30d1386d0a6883d898fc56757a789b8b</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/94813/850316/viewer_manager-3.0.568552-windows-568552.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/97002/862130/viewer_manager-3.0.569958-windows-569958.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3335,7 +3335,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>3.0.568552</string> + <string>3.0.569958</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6aafc07bc7..76160b73ba 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1335,7 +1335,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]) |