diff options
author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-06-23 18:16:01 -0500 |
---|---|---|
committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-06-23 18:16:01 -0500 |
commit | dc36473e3972c73314fcb9bc09811871050a4645 (patch) | |
tree | f005ac4df795a48554e37eb382e793ac5ac8b868 /libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch | |
parent | 30574b6dbf7aa33d6c068bbf1030ce8c23a0ebb3 (diff) | |
download | abslibre-dc36473e3972c73314fcb9bc09811871050a4645.tar.gz abslibre-dc36473e3972c73314fcb9bc09811871050a4645.tar.bz2 abslibre-dc36473e3972c73314fcb9bc09811871050a4645.zip |
pacman-5.1.0-2.parabola1: rebuild
Diffstat (limited to 'libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch')
-rw-r--r-- | libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch b/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch new file mode 100644 index 000000000..b4a5f16ae --- /dev/null +++ b/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch @@ -0,0 +1,27 @@ +From 842bdfbb622db0673d4952812a490e10f61fa3bd Mon Sep 17 00:00:00 2001 +Message-Id: <842bdfbb622db0673d4952812a490e10f61fa3bd.1527784094.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 31 May 2018 17:01:16 +0200 +Subject: [PATCH 1/2] 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. +--- + scripts/makepkg.sh.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index e9080a70..d67fd853 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" +-- +2.17.0 + |