bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: exit on error during build() or package()

Browse source 
Set the ERR trap to abort upon encountering an error during the execution
of a build or package function.

Activate set -E, which lets functions inherit the ERR trap.

Signed-off-by: Henning Garus <henning.garus@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Henning Garus 2009-08-23 17:16:21 +02:00 • committed by Dan McGee
parent b9dd8ce233
commit 545eac145d
1 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
scripts/makepkg.sh.in
View file

@ -175,6 +175,7 @@ clean_up() {
## ##
# Signal Traps # Signal Traps
## ##
set -E
trap 'clean_up' 0 trap 'clean_up' 0
trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
@ -693,6 +694,16 @@ extract_sources() {
fi fi
} }
error_build() {
# first exit all subshells, then print the error
if [ $BASH_SUBSHELL -eq 0 ]; then
error "$(gettext "Build Failed.")"
plain "$(gettext "Aborting...")"
remove_deps
fi
exit 2 # $E_BUILD_FAILED
}
run_build() { run_build() {
# use distcc if it is requested (check buildenv and PKGBUILD opts) # use distcc if it is requested (check buildenv and PKGBUILD opts)
if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then
@ -736,19 +747,31 @@ run_build() {
mv "$BUILDLOG" "$BUILDLOG.$i" mv "$BUILDLOG" "$BUILDLOG.$i"
fi fi
set +E
build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]}
set -E
if [ $ret -gt 0 ]; then error_build; fi
else else
build 2>&1 || ret=$? restoretrap=$(trap -p ERR)
trap 'error_build' ERR
build 2>&1
eval $restoretrap
fi fi
# reset our shell options # reset our shell options
eval "$shellopts" eval "$shellopts"
}
if [ $ret -gt 0 ]; then error_package() {
error "$(gettext "Build Failed.")" if [ -p "$logpipe" ]; then
rm "$logpipe"
fi
# first exit all subshells, then print the error
if [ $BASH_SUBSHELL -eq 0 ]; then
error "$(gettext "Packaging Failed.")"
plain "$(gettext "Aborting...")" plain "$(gettext "Aborting...")"
remove_deps remove_deps
exit 2 # $E_BUILD_FAILED
fi fi
exit 2 # $E_BUILD_FAILED
} }
run_package() { run_package() {
@ -792,19 +815,18 @@ run_package() {
exec 3>&1 exec 3>&1
tee "$BUILDLOG" < "$logpipe" & tee "$BUILDLOG" < "$logpipe" &
exec 1>"$logpipe" 2>"$logpipe" exec 1>"$logpipe" 2>"$logpipe"
$pkgfunc 2>&1 || ret=$? restoretrap=$(trap -p ERR)
trap 'error_package' ERR
$pkgfunc 2>&1
eval $restoretrap
sync sync
exec 1>&3 2>&3 3>&- exec 1>&3 2>&3 3>&-
rm "$logpipe" rm "$logpipe"
else else
$pkgfunc 2>&1 || ret=$? restoretrap=$(trap -p ERR)
fi trap 'error_package' ERR
$pkgfunc 2>&1
if [ $ret -gt 0 ]; then eval $restoretrap
error "$(gettext "Packaging Failed.")"
plain "$(gettext "Aborting...")"
remove_deps
exit 2 # $E_BUILD_FAILED
fi fi
} }