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

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 283 matching lines @@
         self.updateURL = urlparse.urljoin(self.config.nightliesURL, self.basename + '/' + outputFile + '?update')
 
         if self.config.type == 'android':
             apkFile = open(self.path, 'wb')
 
             try:
                 try:
                     port = get_config().get('extensions', 'androidBuildPort')
                 except ConfigParser.NoOptionError:
                     port = '22'
-                buildCommand = ['ssh', '-p', port, get_config().get('extensions', 'androidBuildHost')]
-                buildCommand.extend(map(pipes.quote, [
+                command = ['ssh', '-p', port, get_config().get('extensions', 'androidBuildHost')]
+                command.extend(map(pipes.quote, [
                     '/home/android/bin/makedebugbuild.py', '--revision',
                     self.buildNum, '--version', self.version, '--stdout'
                 ]))
-                subprocess.check_call(buildCommand, stdout=apkFile, close_fds=True)
+                subprocess.check_call(command, stdout=apkFile, close_fds=True)
             except:
                 # clear broken output if any
                 if os.path.exists(self.path):
                     os.remove(self.path)
                 raise
         else:
             env = os.environ
             spiderMonkeyBinary = self.config.spiderMonkeyBinary
             if spiderMonkeyBinary:
                 env = dict(env, SPIDERMONKEY_BINARY=spiderMonkeyBinary)
 
-            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)
+            command = [os.path.join(self.tempdir, 'build.py'),
+                       '-t', self.config.type, 'build', '-b', self.buildNum]
+            if self.config.type != 'gecko':
+                command.extend(['-k', self.config.keyFile])
+            command.append(self.path)
+            subprocess.check_call(command, 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):
                 os.remove(linkPath)
             os.symlink(os.path.basename(self.path), linkPath)
         else:
@@ skipping 293 matching lines @@
         except Exception, ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()