diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-13 21:54:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-13 21:54:43 -0400 |
| commit | ebe8e01ad13cf820fc89f2129928d2279e9d0f8a (patch) | |
| tree | 77f6d7dc4d4af1e3f4080a1b83e2b14586409fc8 /indra/newview | |
| parent | 2a031fa11cb5a5abca41d9eef5fdfb0b7bb54301 (diff) | |
SL-19242: Capture the BugSplat @rpath as str, not bytes.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 76683a1b92..0c54981af3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -996,7 +996,8 @@ class DarwinManifest(ViewerManifest): # work, we need the build to noisily fail! oldpath = subprocess.check_output( ['objdump', '--macho', '--dylib-id', '--non-verbose', - os.path.join(relpkgdir, "BugsplatMac.framework", "BugsplatMac")] + os.path.join(relpkgdir, "BugsplatMac.framework", "BugsplatMac")], + text=True ).splitlines()[-1] # take the last line of output self.run_command( ['install_name_tool', '-change', oldpath, |