diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-03 21:38:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-03 22:27:28 -0400 |
| commit | e228ec9a14b72e68273bf9f83db16ef2881f37b7 (patch) | |
| tree | 71099d996b28b62142436018437df3e4087804d1 /libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch | |
| parent | 995170e8cfb231bbb2f8e9a41a3e12d83d687945 (diff) | |
| download | abslibre-e228ec9a14b72e68273bf9f83db16ef2881f37b7.tar.gz abslibre-e228ec9a14b72e68273bf9f83db16ef2881f37b7.tar.bz2 abslibre-e228ec9a14b72e68273bf9f83db16ef2881f37b7.zip | |
libre/pacman: Update v5.1.0 -> v5.1.1
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, 0 insertions, 27 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 deleted file mode 100644 index b4a5f16ae..000000000 --- a/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - |