Chromium Code Reviews| Index: scripts/slave/bot_update.py |
| diff --git a/scripts/slave/bot_update.py b/scripts/slave/bot_update.py |
| index c209cfa7432027ca4d91e60431c67db0e46da2af..9b7e4711ce7ac80022e7280e1b4b01636aa85b9d 100755 |
| --- a/scripts/slave/bot_update.py |
| +++ b/scripts/slave/bot_update.py |
| @@ -1427,7 +1427,9 @@ def parse_args(): |
| help='Gerrit repository to pull the ref from.') |
| parse.add_option('--gerrit_ref', help='Gerrit ref to apply.') |
| parse.add_option('--specs', help='Gcilent spec.') |
| - parse.add_option('--master', help='Master name.') |
| + parse.add_option('--master', |
| + help='Master name. If specified and it is not in ' |
| + 'bot_update\'s whitelist, bot_update will be noop.') |
| parse.add_option('-f', '--force', action='store_true', |
| help='Bypass check to see if we want to be run. ' |
| 'Should ONLY be used locally or by smart recipes.') |
| @@ -1686,7 +1688,11 @@ def main(): |
| master = options.master |
|
hinoka
2016/05/24 19:36:23
What about just
if not master:
options.force = T
nodir
2016/05/27 18:07:39
Done
|
| # Check if this script should activate or not. |
| - active = check_valid_host(master, builder, slave) or options.force or False |
| + active = ( |
| + not master or |
| + check_valid_host(master, builder, slave) or |
| + options.force or |
| + False) |
| # Print a helpful message to tell developers whats going on with this step. |
| print_help_text( |