Skip to content
Snippets Groups Projects
Commit c0af95e1 authored by James Cook's avatar James Cook
Browse files

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
parent 82d94529
No related branches found
No related tags found
No related merge requests found
...@@ -386,10 +386,7 @@ def package_finish(self): ...@@ -386,10 +386,7 @@ def package_finish(self):
# If we're on a build machine, sign the code using our Authenticode certificate. JC # If we're on a build machine, sign the code using our Authenticode certificate. JC
sign_py = 'C:\\buildscripts\\code-signing\\sign.py' sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
if os.path.exists(sign_py): if os.path.exists(sign_py):
# Appears to require the "python" command to pass a proper argv self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))
# to the script, but only on certain systems. JC
self.run_command('python ' + sign_py + ' ' +
self.dst_path_of(installer_file))
else: else:
print "Skipping code signing,", sign_py, "does not exist" print "Skipping code signing,", sign_py, "does not exist"
self.created_path(self.dst_path_of(installer_file)) self.created_path(self.dst_path_of(installer_file))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment