Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: sitescripts/extensions/bin/createNightlies.py

Issue 29349846: Issue 4337 - Don't use -k command line switch when creating Firefox builds (Closed)
Patch Set: Made the logic a bit simpler Created Aug. 16, 2016, 1:32 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sitescripts/extensions/bin/createNightlies.py
===================================================================
--- a/sitescripts/extensions/bin/createNightlies.py
+++ b/sitescripts/extensions/bin/createNightlies.py
@@ -313,21 +313,21 @@ class NightlyBuild(object):
os.remove(self.path)
raise
else:
env = os.environ
spiderMonkeyBinary = self.config.spiderMonkeyBinary
if spiderMonkeyBinary:
env = dict(env, SPIDERMONKEY_BINARY=spiderMonkeyBinary)
- buildCommand = [
- os.path.join(self.tempdir, 'build.py'), '-t', self.config.type,
- 'build', '-b', self.buildNum, '-k', self.config.keyFile,
- self.path
- ]
+ buildCommand = [os.path.join(self.tempdir, 'build.py'),
Sebastian Noack 2016/08/16 16:06:57 Nit: Is this variable also used somewhere else? Ot
Wladimir Palant 2016/08/17 10:13:53 Done.
+ '-t', self.config.type, 'build', '-b', self.buildNum]
+ if self.config.type != "gecko":
Sebastian Noack 2016/08/16 16:06:57 Nit: As per our coding style guide, and already do
Wladimir Palant 2016/08/17 10:13:53 Done.
+ buildCommand.extend(['-k', self.config.keyFile])
+ buildCommand.append(self.path)
subprocess.check_call(buildCommand, env=env)
if not os.path.exists(self.path):
raise Exception("Build failed, output file hasn't been created")
linkPath = os.path.join(baseDir, '00latest%s' % self.config.packageSuffix)
if hasattr(os, 'symlink'):
if os.path.exists(linkPath):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld