From f78914cc6e3d431ec585c29e469a91121d90a5cf Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 31 May 2018 18:24:54 +0200 Subject: 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 --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) 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" -- cgit v1.2.3-24-g4f1b