From 32b9fe2699cc3359f4480c64cae5a4b6d6de8b24 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 24 Nov 2019 18:30:11 +0100 Subject: [PATCH] reproducible Archlinux: try to be less error prone when ending schroot sessions Signed-off-by: Holger Levsen --- bin/reproducible_build_archlinux_pkg.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 3ea6aade..664ddc69 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -172,6 +172,7 @@ first_build() { if [ $PRESULT -eq 124 ] ; then echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG fi + set +e schroot --end-session -c $SESSION | tee -a $LOG PRESULT=${PIPESTATUS[0]} if [ $PRESULT -ne 0 ] ; then @@ -196,6 +197,7 @@ first_build() { fi fi if ! "$DEBUG" ; then set +x ; fi + set -e } second_build() { @@ -259,6 +261,7 @@ second_build() { if [ $PRESULT -eq 124 ] ; then echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG fi + set +e schroot --end-session -c $SESSION | tee -a $LOG PRESULT=${PIPESTATUS[0]} if [ $PRESULT -ne 0 ] ; then @@ -277,6 +280,7 @@ second_build() { fi fi if ! "$DEBUG" ; then set +x ; fi + set -e } remote_build() { -- GitLab