diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-31 18:04:18 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:21 +1000 |
| commit | 9ac8899d87c3eff149a0ba582fb70b853710e826 (patch) | |
| tree | af8dc7b435be555a5aa1b10d788dd023ce4f0ec8 /buildtools/wafsamba/samba_utils.py | |
| parent | cd104102b9ff90c123342a588d2578cf9d5637ed (diff) | |
| download | samba-9ac8899d87c3eff149a0ba582fb70b853710e826.tar.gz samba-9ac8899d87c3eff149a0ba582fb70b853710e826.tar.bz2 samba-9ac8899d87c3eff149a0ba582fb70b853710e826.zip | |
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
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |