mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(vm_image_util): If DIGESTS wasn't generated don't copy it.

Browse Source 
Failed to test my last change with uploads disabled :(

Also, it needs to be return 0, not return.
This commit is contained in:
Michael Marineau 2014-01-30 13:29:58 -08:00
parent 15bca7930b
commit bf6ee33244
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_library/vm_image_util.sh
View File

@ -635,6 +635,8 @@ vm_upload() {
local digests="$(_dst_dir)/$(_dst_name .DIGESTS)" local digests="$(_dst_dir)/$(_dst_name .DIGESTS)"
upload_image -d "${digests}" "${VM_GENERATED_FILES[@]}" upload_image -d "${digests}" "${VM_GENERATED_FILES[@]}"
[[ -e "${digests}" ]] || return 0
# FIXME(marineam): Temporary alternate name for .DIGESTS # FIXME(marineam): Temporary alternate name for .DIGESTS
# This used to be derived from the first file listed in # This used to be derived from the first file listed in
# ${VM_GENERATED_FILES[@]}", usually $VM_DST_IMG or similar. # ${VM_GENERATED_FILES[@]}", usually $VM_DST_IMG or similar.
@ -656,7 +658,7 @@ vm_upload() {
legacy_digests="${VM_GENERATED_FILES[0]}.DIGESTS" legacy_digests="${VM_GENERATED_FILES[0]}.DIGESTS"
fi fi
[[ "${legacy_digests}" != "${digests}" ]] || return [[ "${legacy_digests}" != "${digests}" ]] || return 0
local legacy_uploads=( "${legacy_digests}" ) local legacy_uploads=( "${legacy_digests}" )
cp "${digests}" "${legacy_digests}" cp "${digests}" "${legacy_digests}"