Issue 4337 - Don't use -k command line switch when creating Firefox builds

sitescripts/extensions/bin/createNightlies.py

Index: sitescripts/extensions/bin/createNightlies.py
===================================================================
--- a/sitescripts/extensions/bin/createNightlies.py
+++ b/sitescripts/extensions/bin/createNightlies.py
@@ -313,21 +313,24 @@ 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
-            ]
+            if self.config.type == "gecko":
+                key_params = []
+            else:
+                key_params = ['-k', self.config.keyFile]
+
+            buildCommand = ([os.path.join(self.tempdir, 'build.py'),

[Sebastian Noack, 2016/08/16 12:27:54]

I think it's a little simpler and more readable if you write it like that:

  build_command = [os.path.join(self.tempdir, 'build.py'),
                   '-t', self.config.type, 'build',
                   '-b', self.buildNum]
  if self.config.type != 'gecko':
      build_command.expand(['-k', self.config.keyFile])
  build_command.append(self.path)

[Wladimir Palant, 2016/08/16 13:33:09]

Done.

+                '-t', self.config.type, 'build', '-b', self.buildNum] +
+                key_params + [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):