diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-05-31 18:24:54 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-06-18 13:15:51 +1000 |
| commit | f78914cc6e3d431ec585c29e469a91121d90a5cf (patch) | |
| tree | e5aa3f68482f28f471fc1414ffd80ea42a9587d4 /scripts | |
| parent | de8c5e78bbaec3aea16523d1a7c5cc6801154c80 (diff) | |
| download | pacman-f78914cc6e3d431ec585c29e469a91121d90a5cf.tar.xz | |
makepkg: Clear ERR trap before trying to restore it
$restoretrap is empty if the trap was not set. This caused the trap
handler to remain and override later exit codes.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0e9da464..14f81692 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -432,6 +432,7 @@ run_function_safe() { run_function "$1" + trap - ERR eval "$restoretrap" eval "$restoreset" eval "$restoreshopt" |