From bf6ee33244e6058742365656a32dca364cf8e70d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 30 Jan 2014 13:29:58 -0800 Subject: [PATCH] fix(vm_image_util): If DIGESTS wasn't generated don't copy it. Failed to test my last change with uploads disabled :( Also, it needs to be return 0, not return. --- build_library/vm_image_util.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index f6b1da68d0..883dec1a79 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -635,6 +635,8 @@ vm_upload() { local digests="$(_dst_dir)/$(_dst_name .DIGESTS)" upload_image -d "${digests}" "${VM_GENERATED_FILES[@]}" + [[ -e "${digests}" ]] || return 0 + # FIXME(marineam): Temporary alternate name for .DIGESTS # This used to be derived from the first file listed in # ${VM_GENERATED_FILES[@]}", usually $VM_DST_IMG or similar. @@ -656,7 +658,7 @@ vm_upload() { legacy_digests="${VM_GENERATED_FILES[0]}.DIGESTS" fi - [[ "${legacy_digests}" != "${digests}" ]] || return + [[ "${legacy_digests}" != "${digests}" ]] || return 0 local legacy_uploads=( "${legacy_digests}" ) cp "${digests}" "${legacy_digests}"