summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-13 20:12:43 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-13 20:12:43 -0400
commit2670cde77b3f75a34f537fb935464c73e9e2814a (patch)
tree41510263ae5800290b17915daf308d77c47f7417
parent6c6f6f402383baaa53cb14f31813654a6c6c0279 (diff)
SL-19242: On NSIS error, dump the generated .nsi file.
-rwxr-xr-xindra/newview/viewer_manifest.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index fb22d29183..62e64b1d44 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -849,7 +849,15 @@ class WindowsManifest(ViewerManifest):
# Because we've written relative pathnames into tempfile, run nsis
# with their base directory as current.
- self.run_command([nsis_path, '/V2', tempfile], cwd=self.get_dst_prefix())
+ try:
+ self.run_command([nsis_path, '/V2', tempfile], cwd=self.get_dst_prefix())
+ except ManifestError as err:
+ print(f' {tempfile} '.center(72, '='))
+ with open(self.dst_path_of(tempfile)) as nsi:
+ for line in nsi:
+ print(line)
+ print(72 * '=')
+ raise
self.sign(installer_file)
self.created_path(self.dst_path_of(installer_file))