Skip to content
GitLab
Commit 32b9fe26 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Archlinux: try to be less error prone when ending schroot sessions 



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent e2ce7d08
Show whitespace changes
Inline Side-by-side
bin/reproducible_build_archlinux_pkg.sh
View file @ 32b9fe26
...@@ -172,6 +172,7 @@ first_build() { ...@@ -172,6 +172,7 @@ first_build() {
if [ $PRESULT -eq 124 ] ; then if [ $PRESULT -eq 124 ] ; then
echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
fi fi
set +e
schroot --end-session -c $SESSION | tee -a $LOG schroot --end-session -c $SESSION | tee -a $LOG
PRESULT=${PIPESTATUS[0]} PRESULT=${PIPESTATUS[0]}
if [ $PRESULT -ne 0 ] ; then if [ $PRESULT -ne 0 ] ; then
...@@ -196,6 +197,7 @@ first_build() { ...@@ -196,6 +197,7 @@ first_build() {
fi fi
fi fi
if ! "$DEBUG" ; then set +x ; fi if ! "$DEBUG" ; then set +x ; fi
set -e
} }
second_build() { second_build() {
...@@ -259,6 +261,7 @@ second_build() { ...@@ -259,6 +261,7 @@ second_build() {
if [ $PRESULT -eq 124 ] ; then if [ $PRESULT -eq 124 ] ; then
echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
fi fi
set +e
schroot --end-session -c $SESSION | tee -a $LOG schroot --end-session -c $SESSION | tee -a $LOG
PRESULT=${PIPESTATUS[0]} PRESULT=${PIPESTATUS[0]}
if [ $PRESULT -ne 0 ] ; then if [ $PRESULT -ne 0 ] ; then
...@@ -277,6 +280,7 @@ second_build() { ...@@ -277,6 +280,7 @@ second_build() {
fi fi
fi fi
if ! "$DEBUG" ; then set +x ; fi if ! "$DEBUG" ; then set +x ; fi
set -e
} }
remote_build() { remote_build() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment