| OLD | NEW | 
|---|
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, | 
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 339                 if os.path.exists(self.path): | 339                 if os.path.exists(self.path): | 
| 340                     os.remove(self.path) | 340                     os.remove(self.path) | 
| 341                 raise | 341                 raise | 
| 342         else: | 342         else: | 
| 343             env = os.environ | 343             env = os.environ | 
| 344             spiderMonkeyBinary = self.config.spiderMonkeyBinary | 344             spiderMonkeyBinary = self.config.spiderMonkeyBinary | 
| 345             if spiderMonkeyBinary: | 345             if spiderMonkeyBinary: | 
| 346                 env = dict(env, SPIDERMONKEY_BINARY=spiderMonkeyBinary) | 346                 env = dict(env, SPIDERMONKEY_BINARY=spiderMonkeyBinary) | 
| 347 | 347 | 
| 348             command = [os.path.join(self.tempdir, 'build.py'), | 348             command = [os.path.join(self.tempdir, 'build.py'), | 
| 349                        '-t', self.config.type, 'build', '-b', self.buildNum] | 349                        'build', '-t', self.config.type, '-b', self.buildNum] | 
| 350             if self.config.type not in {'gecko', 'gecko-webext', 'edge'}: | 350             if self.config.type not in {'gecko', 'gecko-webext', 'edge'}: | 
| 351                 command.extend(['-k', self.config.keyFile]) | 351                 command.extend(['-k', self.config.keyFile]) | 
| 352             command.append(self.path) | 352             command.append(self.path) | 
| 353             subprocess.check_call(command, env=env) | 353             subprocess.check_call(command, env=env) | 
| 354 | 354 | 
| 355         if not os.path.exists(self.path): | 355         if not os.path.exists(self.path): | 
| 356             raise Exception("Build failed, output file hasn't been created") | 356             raise Exception("Build failed, output file hasn't been created") | 
| 357 | 357 | 
| 358         linkPath = os.path.join(baseDir, '00latest%s' % self.config.packageSuffi
     x) | 358         linkPath = os.path.join(baseDir, '00latest%s' % self.config.packageSuffi
     x) | 
| 359         if hasattr(os, 'symlink'): | 359         if hasattr(os, 'symlink'): | 
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 717         except Exception as ex: | 717         except Exception as ex: | 
| 718             logging.error('The build for %s failed:', repo) | 718             logging.error('The build for %s failed:', repo) | 
| 719             logging.exception(ex) | 719             logging.exception(ex) | 
| 720 | 720 | 
| 721     file = open(nightlyConfigFile, 'wb') | 721     file = open(nightlyConfigFile, 'wb') | 
| 722     nightlyConfig.write(file) | 722     nightlyConfig.write(file) | 
| 723 | 723 | 
| 724 | 724 | 
| 725 if __name__ == '__main__': | 725 if __name__ == '__main__': | 
| 726     main() | 726     main() | 
| OLD | NEW | 
|---|