diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-25 17:37:42 +0000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-25 17:37:42 +0000 |
| commit | 58fe79eef64fb87b2553e6514a47beaa6d0249c1 (patch) | |
| tree | a5715cc4c84367a4d04e2c0454b421c7ebe45312 /scripts | |
| parent | a07b490344483ddee2980214ef470cf4defdda3f (diff) | |
| download | pacman-58fe79eef64fb87b2553e6514a47beaa6d0249c1.tar.xz | |
* Fix bug where 'makepkg -L' doesn't stop on build failure.v3.0.0
Andrew Fyfe <andrew@neptune-one.net>
* Add testing to etc/pacman.d/.cvsignore
* Fix scriptlet001.py test to work during 'make check'.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/makepkg | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/scripts/makepkg b/scripts/makepkg index 426b0e95..5afb285c 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -883,6 +883,7 @@ else echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? + ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then @@ -899,24 +900,18 @@ else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - - if [ ${PIPESTATUS[0]} -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 + build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e - if [ $? -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 fi fi |