From 9ac8899d87c3eff149a0ba582fb70b853710e826 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 31 Mar 2010 18:04:18 +1100
Subject: build: sys.exit is better than raise here

using raise produces a screen full of stuff the user can't
understand. The message is much clearer with an exit
---
 buildtools/wafsamba/samba_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buildtools/wafsamba')

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 5bff769400..9152cc2ed0 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -221,7 +221,7 @@ def subst_vars_error(string, env):
             vname = v[2:-1]
             if not vname in env:
                 print "Failed to find variable %s in %s" % (vname, string)
-                raise
+                sys.exit(1)
             v = env[vname]
         out.append(v)
     return ''.join(out)
@@ -338,7 +338,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None):
     # typo of $( instead of ${
     if ret.find('${') != -1 or ret.find('$(') != -1:
         print('Failed to substitute all variables in varstr=%s' % ret)
-        raise
+        sys.exit(1)
     return ret
 Build.BuildContext.EXPAND_VARIABLES = EXPAND_VARIABLES
 
-- 
cgit