cr-daily-branch, make-flight: use ${...:-...} not ${...-...}, to treat empty values...

diff --git a/cr-daily-branch b/cr-daily-branch
index 3f109c0330ffb289fcd17eb525833ee5d9832452..e343a995988579f4da282453bec56f210193cbbd 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -116,11 +116,11 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then
         export REVISION_QEMU_UPSTREAM
 fi
 if [ "x$REVISION_LINUX" = x ]; then
-       determine_version REVISION_LINUX ${linuxbranch-linux} LINUX
+       determine_version REVISION_LINUX ${linuxbranch:-linux} LINUX
         export REVISION_LINUX
 fi
 if [ "x$REVISION_LINUX_ARM" = x ]; then
-       determine_version REVISION_LINUX_ARM ${linuxbranch-linux-arm-xen} \
+       determine_version REVISION_LINUX_ARM ${linuxbranch:-linux-arm-xen} \
                LINUX_ARM
         export REVISION_LINUX_ARM
 fi

diff --git a/make-flight b/make-flight
index 0505d6c09f0558e2f1407610a0bae051554d541f..f3461240ab7a7cb86dbe7b8f6f48f795f3af2ede 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -46,13 +46,13 @@ if [ x$buildflight = x ]; then
       esac
       pvops_kernel="
        tree_linux=$TREE_LINUX_ARM
-       revision_linux=${REVISION_LINUX_ARM-${DEFAULT_REVISION_LINUX_ARM}}
+       revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
       "
       ;;
     *)
       pvops_kernel="
        tree_linux=$TREE_LINUX
-       revision_linux=${REVISION_LINUX-${DEFAULT_REVISION_LINUX}}
+       revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
       "
       ;;
     esac