commit 08af06b1c1ac824fb036f1622ffbba16e516f5d8
author Gilad Arnold <garnold@chromium.org> Mon Mar 23 18:00:31 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Mar 24 07:17:06 2015 +0000
tree 5c342f8b6b67e5d269b126923e4c1d59bae8244d
parent b2c9c3be50b1d720c84b14897b0cc148dffbec56

setup_board: --brick overrides --board.

This is necessary because --board has a default value, which may be
non-empty. Same logic was applied in (e.g.) cros_workon.

BUG=None
TEST=./setup_board --brick overrides --board value and emits a warning.

Change-Id: I485ad55f46764904851c7c3382257765d37ca6cb
Reviewed-on: https://chromium-review.googlesource.com/262044
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

setup_board

diff --git a/setup_board b/setup_board
index d963dac..d3cd0f9 100755
--- a/setup_board
+++ b/setup_board
@@ -265,8 +265,11 @@
 
 if [[ -z "${FLAGS_board}" ]] && [[ -z "${FLAGS_brick}" ]]; then
   die "--board or --brick required."
-elif [[ -n "${FLAGS_board}" ]] && [[ -n "${FLAGS_brick}" ]]; then
-  die "--board and --brick are incompatible."
+elif [[ -n "${FLAGS_brick}" ]]; then
+  # Override board name with the brick's friendly name (backward compatibility).
+  [[ -z "${FLAGS_board}" ]] || warn "--brick was used, ignoring --board value"
+  FLAGS_board="$(cros_brick_utils --friendly-name "${FLAGS_brick}")"
+  [[ -n "${FLAGS_board}" ]] || die_notrace
 fi
 
 get_board_and_variant "${FLAGS_board}" "${FLAGS_variant}" "${FLAGS_brick}"