From fbb2bd2b8e1337f59bd56728460f9ea2fb5fc423 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sat, 27 Oct 2012 09:51:36 +0200 Subject: 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 --- makechrootpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makechrootpkg.in') diff --git a/makechrootpkg.in b/makechrootpkg.in index 0535c8c..6c0b013 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -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 -- cgit v1.2.3-54-g00ecf