diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-27 15:46:09 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-27 15:46:09 +0000 |
commit | fee55ee33a4be2398224e345d4907e86b5acbb1f (patch) | |
tree | e147767c1bf6c9c66f65a77f5398d764a540b083 /distbuild.configure | |
parent | 32446688366229cad3f7bacb93e3118cff36163f (diff) | |
parent | 946d6b530ebda661c4db0e28d8aba2570044941c (diff) | |
download | definitions-fee55ee33a4be2398224e345d4907e86b5acbb1f.tar.gz |
Merge branch 'baserock/sam/fix-build-system-deploy'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
Diffstat (limited to 'distbuild.configure')
-rw-r--r-- | distbuild.configure | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/distbuild.configure b/distbuild.configure index d9b9fb8a..062aaecc 100644 --- a/distbuild.configure +++ b/distbuild.configure @@ -45,20 +45,21 @@ if [ -n "$DISTBUILD_GENERIC" ]; then exit 0 fi +# Set default values for these two options if they are unset, so that if the +# user specifies no distbuild config at all the configure extension exits +# without doing anything but does not raise an error. +DISTBUILD_CONTROLLER=${DISTBUILD_CONTROLLER-False} +DISTBUILD_WORKER=${DISTBUILD_WORKER-False} + +if [ "$DISTBUILD_CONTROLLER" = False -a "$DISTBUILD_WORKER" = False ]; then + exit 0 +fi + set -u # Check that all the variables needed are present: error_vars=false -if [ "x$DISTBUILD_WORKER" = "x" ]; then - echo "ERROR: DISTBUILD_WORKER needs to be defined." - error_vars=true -fi - -if [ "x$DISTBUILD_CONTROLLER" = "x" ]; then - echo "ERROR: DISTBUILD_CONTROLLER needs to be defined." - error_vars=true -fi if [ "x$TROVE_HOST" = "x" ]; then echo "ERROR: TROVE_HOST needs to be defined." |