From 0a6d4ab158799268bca75a1760a27f9b8761ba0a Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 26 Sep 2014 15:04:04 +0000
Subject: Fix deploying a non-generic Mason

Fixed DISTBUILD_GENERIC check in distbuild.configure, and
TROVE_ADMIN_NAME check in mason.configure

Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
---
 distbuild.configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'distbuild.configure')

diff --git a/distbuild.configure b/distbuild.configure
index 79148106..d9b9fb8a 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -40,13 +40,12 @@
 
 set -e
 
-set -u
-
 if [ -n "$DISTBUILD_GENERIC" ]; then
     echo "Not configuring the distbuild node, it will be generic"
     exit 0
 fi
 
+set -u
 
 # Check that all the variables needed are present:
 
-- 
cgit v1.2.1