build: sys.exit is better than raise here
authorAndrew Tridgell <tridge@samba.org>
Wed, 31 Mar 2010 07:04:18 +0000 (18:04 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:27:21 +0000 (20:27 +1000)
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

index 5bff769400d3f8b5b10ed805172fd087f50a4c9e..9152cc2ed02905c514037a63579a9ded8f58a546 100644 (file)
@@ -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