Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Jan Alexander Steffens (heftig) 2012-10-27 09:51:36 +02:00 committed by Pierre Schmitz
parent d5c6bc7656
commit fbb2bd2b8e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.sh
View File

@ -78,7 +78,7 @@ trap_abort() {
trap_exit() {
trap - EXIT INT QUIT TERM HUP
cleanup 0
cleanup
}
die() {

4
makechrootpkg.in
View File

@ -213,12 +213,12 @@ if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
fi
if [[ -n $MAKEFLAGS ]]; then
if [[ -n $MAKEFLAGS ]]; then
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
fi
if [[ -n $PACKAGER ]]; then
if [[ -n $PACKAGER ]]; then
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
fi

3
mkarchroot.in
View File

@ -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}"