diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-12 18:41:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-13 18:17:25 +0200 |
| commit | 9ae86dc3fc9db623dbed81c74e7ab37bce785715 (patch) | |
| tree | 79b0c367e8ff7c1af601e57276bd4d9946f2659d /pkgs/stdenv/generic | |
| parent | 6671bb8be4744cc15c9da2871766ce6e16886488 (diff) | |
| download | nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar.gz nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar.bz2 nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar.lz nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar.xz nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.tar.zst nixlib-9ae86dc3fc9db623dbed81c74e7ab37bce785715.zip | |
Ensure that errexit is honoured in hooks
Partial fix for #7524.
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 75be719c2b95..47e330562708 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -19,7 +19,7 @@ runHook() { if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi eval "local -a dummy=(\"\${$var[@]}\")" for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do - if ! _eval "$hook" "$@"; then return 1; fi + _eval "$hook" "$@" done return 0 } |