summaryrefslogtreecommitdiffstats
path: root/mkarchroot.in
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2012-10-27 09:51:36 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-10-27 20:27:39 +0200
commitfbb2bd2b8e1337f59bd56728460f9ea2fb5fc423 (patch)
tree8c1e0a30d1576177961f1fb218aaf94e6959c967 /mkarchroot.in
parentd5c6bc7656d3da87a61ab249fca762ddf08e1887 (diff)
downloaddevtools-fbb2bd2b8e1337f59bd56728460f9ea2fb5fc423.tar.gz
devtools-fbb2bd2b8e1337f59bd56728460f9ea2fb5fc423.tar.xz
Fix return code handling
Stop trap_exit from forcing a 0 exit code. This fixes makechrootpkg, which used to always return success, even if the build failed. Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Diffstat (limited to 'mkarchroot.in')
-rw-r--r--mkarchroot.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkarchroot.in b/mkarchroot.in
index 7ea90e1..76ad840 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -160,7 +160,8 @@ copy_hostconf () {
}
trap_chroot_umount () {
- trap 'trap_exit' EXIT INT QUIT TERM HUP
+ trap 'trap_abort' INT QUIT TERM HUP
+ trap 'trap_exit' EXIT
for cache_dir in ${cache_dirs[@]}; do
umount "${working_dir}/${cache_dir}"