From: Ian Jackson <iwj@woking.cam.xci-test.com>
Date: Tue, 17 Sep 2013 10:56:58 +0000 (+0100)
Subject: cr-daily-branch, make-flight: use ${...:-...} not ${...-...}, to treat empty values... 
X-Git-Tag: wip.xsm-13-actual.base~449
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8268dc407bb0e375b190f8f2fd8203cff6676592;p=people%2Fiwj%2Fosstest.git

cr-daily-branch, make-flight: use ${...:-...} not ${...-...}, to treat empty values the same as unset; fixes regression
---

diff --git a/cr-daily-branch b/cr-daily-branch
index 3f109c03..e343a995 100755
--- 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 0505d6c0..f3461240 100755
--- 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