cbuildbot: Tweak --local and --remote messages.
We recently removed --local and --remote tryjob support from
cbuildbot, but the messaging to help people who use the wrong tryjob
command didn't work out right. Fix it!
BUG=chromium:762676
TEST=run_tests -q
Change-Id: I47d39f179a0481ac7fc509b609797ae748587055
Reviewed-on: https://chromium-review.googlesource.com/666005
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Nicolas Norvez <norvez@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 7c313ca..457d5fb 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -281,9 +281,9 @@
'Deprecated Options')
parser.add_option('--local', action='store_true', default=False,
- help='Deprecated. See cros trybot.')
+ help='Deprecated. See cros tryjob.')
parser.add_option('--remote', action='store_true', default=False,
- help='Deprecated. See cros trybot.')
+ help='Deprecated. See cros tryjob.')
#
# Patch selection options.
@@ -584,6 +584,9 @@
options.parsed_args, lambda x: x.opt_inst.pass_through)
options.pass_through_args.extend(accepted)
+ if options.local or options.remote:
+ cros_build_lib.Die('Deprecated usage. Please use cros tryjob instead.')
+
if not options.buildroot:
cros_build_lib.Die('A buildroot is required to build.')
@@ -835,9 +838,6 @@
if options.config_repo:
cros_build_lib.Die('Deprecated usage. Ping crbug.com/735696 you need it.')
- if options.local or options.remote:
- cros_build_lib.Die('Deprecated usage. Please use cros tryjob instead.')
-
# Fetch our site_config now, because we need it to do anything else.
site_config = config_lib.GetConfig()