From b3e81f22e4a7e3431a04a4cc963770f4d9d78845 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 29 Jan 2014 14:01:33 -0800
Subject: [PATCH] fix(image_to_vm): Wrap upload_image in vm_upload.

This keeps all references to VM_GENERATED_FILES inside of
build_library/vm_image_util.sh so changes that impact it more obvious.
---
 build_library/vm_image_util.sh | 4 ++++
 image_to_vm.sh                 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 2a67635f1e..a678d52d4d 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -631,6 +631,10 @@ vm_cleanup() {
     sudo rm -rf "${VM_TMP_DIR}"
 }
 
+vm_upload() {
+    upload_image "${VM_GENERATED_FILES[@]}"
+}
+
 print_readme() {
     local filename
     info "Files written to $(relpath "$(dirname "${VM_DST_IMG}")")"
diff --git a/image_to_vm.sh b/image_to_vm.sh
index d2bf6823b5..37d25de020 100755
--- a/image_to_vm.sh
+++ b/image_to_vm.sh
@@ -106,7 +106,7 @@ vm_cleanup
 trap - EXIT
 
 # Optionally upload all of our hard work
-upload_image "${VM_GENERATED_FILES[@]}"
+vm_upload
 
 # Ready to set sail!
 okboat