From 924414d65e06c6aa4d835fd40ea7940c7ca92080 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Jun 2017 10:04:57 -0400
Subject: [PATCH] MAINT-7514: Fetch needed env vars in WindowsManifest.sign()
method.
---
indra/newview/viewer_manifest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3f6fc94d92e..2d88fe7dce8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -704,16 +704,14 @@ def package_finish(self):
# If we're on a build machine, sign the code using our Authenticode certificate. JC
# note that the enclosing setup exe is signed later, after the makensis makes it.
- sign_py = os.environ.get('SIGN', r'C:\buildscripts\code-signing\sign.py')
- python = os.environ.get('PYTHON', 'python')
- #Unlike the viewer binary, the VMP filenames are invariant with respect to version, os, etc.
+ # Unlike the viewer binary, the VMP filenames are invariant with respect to version, os, etc.
for exe in (
"apply_update.exe",
"download_update.exe",
"SL_Launcher.exe",
"update_manager.exe",
):
- self.sign(sign_py, exe)
+ self.sign(exe)
# We use the Unicode version of NSIS, available from
# http://www.scratchpaper.com/
@@ -741,11 +739,13 @@ def package_finish(self):
print >> sys.stderr, "Maximum nsis attempts exceeded; giving up"
raise
- self.sign(sign_py, installer_file)
+ self.sign(installer_file)
self.created_path(self.dst_path_of(installer_file))
self.package_file = installer_file
- def sign(self, sign_py, exe):
+ def sign(self, exe):
+ sign_py = os.environ.get('SIGN', r'C:\buildscripts\code-signing\sign.py')
+ python = os.environ.get('PYTHON', 'python')
if os.path.exists(sign_py):
dst_path = self.dst_path_of(exe)
print "about to run signing of: ", dst_path
--
GitLab