commit 4d97cbfdcaa191bde37829afbb7ad81a3730f061
author mukesh agrawal <quiche@chromium.org> Fri Oct 25 13:18:39 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 01 23:08:48 2013 +0000
tree 35b5b08531025b419c1bf605262547c04c3db2b2
parent e6ad9719675aa3ce0e5b94e23b6504e68afbfb90

cros_vm_lib: add/fix some logging

1. Add a log message indicating the path of the VM disk image
   copy, so sheriffs can figure out which of the (possibly)
   multiple images is relevant.
2. Fix an existing log message, which claims that we are continuing,
   even though we are die-ing.
3. Add a comment about a dependency of cbuildbot_stages.py on this
   script.

BUG=chromium:311837
TEST=x86-generic-paladin trybot

Change-Id: I3512bf5a3f013945dd14efbdccc28c10a5ebba66
Reviewed-on: https://chromium-review.googlesource.com/175362
Tested-by: mukesh agrawal <quiche@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: mukesh agrawal <quiche@chromium.org>

lib/cros_vm_lib.sh

diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh
index 254d437..824a6d5 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -87,11 +87,13 @@
 
     local vm_image="$1"
     if [ ${FLAGS_copy} -eq ${FLAGS_TRUE} ]; then
+      # This filename template must be kept in sync with cbuildbot_stages.py.
       local our_copy=$(mktemp "${vm_image}.copy.XXXXXXXXXX")
       if cp "${vm_image}" "${our_copy}"; then
+          info "Copied ${vm_image} to ${our_copy}."
           vm_image="${our_copy}"
       else
-          die "Copy failed. Continuing without copy."
+          die "Copy failed. Aborting."
       fi
     fi