From c0af95e18c57a7e0578df780697042f8a6221431 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 4 Mar 2009 20:01:08 +0000
Subject: [PATCH] Back out last commit, which worked on my machine and not on
the build machines. Infuriating!
Merging revisions 113619-113618 of svn+ssh://svn.lindenlab.com/svn/linden/trunk into E:\trunk, respecting ancestry
---
indra/newview/viewer_manifest.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index debbcd7e3bf..c79c2aedf1d 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -386,10 +386,7 @@ def package_finish(self):
# If we're on a build machine, sign the code using our Authenticode certificate. JC
sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
if os.path.exists(sign_py):
- # Appears to require the "python" command to pass a proper argv
- # to the script, but only on certain systems. JC
- self.run_command('python ' + sign_py + ' ' +
- self.dst_path_of(installer_file))
+ self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))
else:
print "Skipping code signing,", sign_py, "does not exist"
self.created_path(self.dst_path_of(installer_file))
--
GitLab