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>
This commit is contained in:
parent
d5c6bc7656
commit
fbb2bd2b8e
|
@ -78,7 +78,7 @@ trap_abort() {
|
||||||
|
|
||||||
trap_exit() {
|
trap_exit() {
|
||||||
trap - EXIT INT QUIT TERM HUP
|
trap - EXIT INT QUIT TERM HUP
|
||||||
cleanup 0
|
cleanup
|
||||||
}
|
}
|
||||||
|
|
||||||
die() {
|
die() {
|
||||||
|
|
|
@ -213,12 +213,12 @@ if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
|
||||||
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
|
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $MAKEFLAGS ]]; then
|
if [[ -n $MAKEFLAGS ]]; then
|
||||||
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
|
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
|
||||||
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
|
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $PACKAGER ]]; then
|
if [[ -n $PACKAGER ]]; then
|
||||||
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
|
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
|
||||||
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
|
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -160,7 +160,8 @@ copy_hostconf () {
|
||||||
}
|
}
|
||||||
|
|
||||||
trap_chroot_umount () {
|
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
|
for cache_dir in ${cache_dirs[@]}; do
|
||||||
umount "${working_dir}/${cache_dir}"
|
umount "${working_dir}/${cache_dir}"
|
||||||
|
|
Loading…
Reference in New Issue