From 89b029c7c0c51c510fe7f7cbe45c5f48385fee9a Mon Sep 17 00:00:00 2001
From: Daniel Erat <derat@google.com>
Date: Thu, 22 Apr 2010 13:59:07 -0700
Subject: [PATCH] build: Re-hide pointless question in image_to_usb.sh
 --test_image.

Undoes a change from 5c3b457f.  Hardcoding "--yes" in the
call to mod_image_for_test.sh instead of inheriting
image_to_usb.sh's "yes" was intentional.  The user may not
pass --yes to image_to_usb.sh since they want to confirm
that they're writing to the correct device, but they already
told us that they want the image to be modified for test
with --test_image, so there's no reason to ask about it
again.

BUG=none
TEST=ran it

Review URL: http://codereview.chromium.org/1736005
---
 image_to_usb.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/image_to_usb.sh b/image_to_usb.sh
index 2cba18aae4..e489f730aa 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -113,15 +113,12 @@ if [ ${FLAGS_test_image} -eq ${FLAGS_TRUE} ] ; then
     if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
       FACTORY_ARGS="--factory"
     fi
-    # Check for yes
-    if [ ${FLAGS_yes} -eq ${FLAGS_TRUE} ] ; then
-      YES="--yes"
-    fi
 
-
-    # Modify it.
+    # Modify it.  Pass --yes so that mod_image_for_test.sh won't ask us if we
+    # really want to modify the image; the user gave their assent already with
+    # --test-image and the original image is going to be preserved.
     "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
-      "${FLAGS_from}/chromiumos_test_image.bin" ${FACTORY_ARGS} ${YES}
+      "${FLAGS_from}/chromiumos_test_image.bin" ${FACTORY_ARGS} --yes
     echo "Done with mod_image_for_test."
   else
     echo "Using cached test image."