From 45156c46e1640647e3026db19b54fe3bf35fec96 Mon Sep 17 00:00:00 2001 From: Zdenek Behan Date: Thu, 26 Aug 2010 16:17:03 -0700 Subject: [PATCH] cros_workon: make --board and --host not exclusive This fixes a case where you can't specify host if you have a default board set. BUG=6039 TEST=cros_workon start with --host, --board, both Change-Id: Iad0d3f646dde10cc4adc4131e93f75fabe92f392 Review URL: http://codereview.chromium.org/3157044 --- cros_workon | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cros_workon b/cros_workon index 1a9626b1f6..128933a84a 100755 --- a/cros_workon +++ b/cros_workon @@ -45,9 +45,13 @@ WORKON_CMD=$1 shift -# board dir config +# Board dir config + +# If both are specified, just use host, because board does not +# have to be specified and may come from default, in which case +# there's no way to override. [ -n "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_TRUE} ] && \ - die "Flags --host and --board are mutually exclusive." + FLAGS_board="" # kill board [ -z "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_FALSE} ] && \ die "You must specify either --host or --board="