cr-daily-branch: Move harness_rev definition

And also adjust some formatting.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/cr-daily-branch b/cr-daily-branch
index 158554d79e11a2adc428f0f0c6d8b1ff7b0626ed..f0c6718ce782743585a4146f906e194c01762ade 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -272,9 +272,9 @@ if [ "x$OLD_REVISION" = xdetermine-late ]; then
 fi
 
 case $branch in
-distros-*) makeflight=./make-distros-flight ;;
-xen-*-coverity)makeflight=./make-coverity-flight ;;
-*)         makeflight=./make-flight ;;
+distros-*)     makeflight=./make-distros-flight ;;
+xen-*-coverity)        makeflight=./make-coverity-flight ;;
+*)             makeflight=./make-flight ;;
 esac
 
 if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then
@@ -294,10 +294,12 @@ $DAILY_BRANCH_PREMAKE_HOOK
 
 flight=`$makeflight $branch $xenbranch $OSSTEST_BLESSING "$@"`
 
+harness_rev=$(perl -e 'use Osstest; print get_harness_rev();')
+narness_rev=${harness_rev%+}
+
 case $branch in
 xen-unstable-smoke)
-       harness_rev=$(perl -e 'use Osstest; print get_harness_rev();')
-       : ${SMOKE_HARNESS_REV:=${harness_rev%+}}
+       : ${SMOKE_HARNESS_REV:=$harness_rev}
 
        ./mg-adjust-flight-makexrefs -v $flight \
                '!build-amd64 !build-amd64-libvirt !build-armhf build-*' \