Index: build.py |
diff --git a/build.py b/build.py |
index e16dfde1b47d6baf490f11fecb046716b2f9ce78..0b12703e4d96b547ceadbaf4d3107ac2fc799842 100644 |
--- a/build.py |
+++ b/build.py |
@@ -442,8 +442,8 @@ def runReleaseAutomation(baseDir, scriptName, opts, args, type): |
usage(scriptName, type, 'release') |
return |
- if type == 'chrome' and len(keyFiles) != 2: |
- print >>sys.stderr, 'Error: wrong number of key files specified, two keys (Chrome and Safari) required for the release' |
+ if (type == 'chrome' or type == 'safari') and len(keyFiles) != 1: |
Wladimir Palant
2016/10/20 10:03:07
Probably better to use `type in ('chrome', 'safari
Sebastian Noack
2016/10/20 10:25:26
I agree, however, a set is even more appropriate h
kzar
2016/10/20 12:09:36
Done.
|
+ print >>sys.stderr, 'Error: you must specify a key file for this release' |
usage(scriptName, type, 'release') |
return |
@@ -525,7 +525,7 @@ with addCommand(runReleaseAutomation, 'release') as command: |
command.addOption('File containing private key and certificates required to sign the release. Note that for Chrome releases this option needs to be specified twice: first a key to sign Chrome builds, then another to sign the Safari build.', short='k', long='key', value='file', types=('chrome',)) |
Wladimir Palant
2016/10/20 10:03:07
This description needs to be updated, the note is
kzar
2016/10/20 12:09:36
Done.
|
command.addOption('Directory containing downloads repository (if omitted ../downloads is assumed)', short='d', long='downloads', value='dir') |
command.params = '[options] <version>' |
- command.supportedTypes = ('gecko', 'chrome') |
+ command.supportedTypes = ('gecko', 'chrome', 'safari', 'edge') |
with addCommand(updatePSL, 'updatepsl') as command: |
command.shortDescription = 'Updates Public Suffix List' |