summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-06-02 05:54:20 +0200
committerDave Reisner <dreisner@archlinux.org>2014-09-22 14:25:42 +0200
commitaf6c0a0f6a7644f583f2d83ba7a61e82b77bdc37 (patch)
treebc3d3ab5b9183bb686165c59e2037a6e6d6fb82e /lib
parent905198295dcb4fffcd16edff3fd7052a4cfc5788 (diff)
downloaddevtools-af6c0a0f6a7644f583f2d83ba7a61e82b77bdc37.tar.gz
devtools-af6c0a0f6a7644f583f2d83ba7a61e82b77bdc37.tar.xz
common.sh: propagate error through trap_exit
Fixes a breakage introduced in 6db31cc16a80442 which leads to errors being masked from makechrootpkg.
Diffstat (limited to 'lib')
-rw-r--r--lib/common.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common.sh b/lib/common.sh
index b885080..104850b 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -79,8 +79,9 @@ trap_abort() {
}
trap_exit() {
+ local r=$?
trap - EXIT INT QUIT TERM HUP
- cleanup
+ cleanup $r
}
die() {