diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2012-10-27 09:51:36 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-10-27 20:27:39 +0200 |
| commit | fbb2bd2b8e1337f59bd56728460f9ea2fb5fc423 (patch) | |
| tree | 8c1e0a30d1576177961f1fb218aaf94e6959c967 /makechrootpkg.in | |
| parent | d5c6bc7656d3da87a61ab249fca762ddf08e1887 (diff) | |
| download | 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 'makechrootpkg.in')
| -rw-r--r-- | makechrootpkg.in | 4 |
1 files changed, 2 insertions, 2 deletions
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 |