From 137c8db8cc1aa49a306531413e9cba5688cb9990 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 5 Sep 2018 20:33:19 -0400
Subject: [PATCH] SL-957: Previous commit skipped a couple assignments used
later.
---
indra/newview/viewer_manifest.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d70dbed9e0c..aa03780e192 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -930,11 +930,13 @@ def construct(self):
# top-level Info.plist is as generated by CMake
Info_plist = self.dst_path_of("Info.plist")
+ toplevel_MacOS = self.dst_path_of("MacOS")
# the one file in top-level MacOS directory is the trampoline to
# our nested launcher_app
- if self.is_rearranging():
+ if not self.is_rearranging():
+ trampoline = ""
+ else:
with self.prefix(dst="MacOS"):
- toplevel_MacOS = self.get_dst_prefix()
trampoline = self.put_in_file("""\
#!/bin/bash
open "%s" --args "$@"
--
GitLab