From ebdc17237756e0b2aada8b8af442a12540f44237 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 22 Jul 2021 14:54:11 -0400 Subject: [PATCH] Fix: Don't exit on error while collecting data for _sys-info.log Change-Id: Ic3ed23b727b4663f01e52205641b23505518d3b9 Signed-off-by: Dave Wallace --- shell/deploy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell/deploy b/shell/deploy index f401bc6d..9e825947 100755 --- a/shell/deploy +++ b/shell/deploy @@ -229,6 +229,8 @@ deploy_logs() { env | grep -v -E "COOKIE|DOCKER|HUDSON|KEY|PASSWORD|SSH|TOKEN" | sort > "_build-enviroment-variables.log" # Print system info before collecting logs + local set_opts="$-" + set +e # disable exit on errors touch "_sys-info.log" { local sys_cmds @@ -251,6 +253,7 @@ deploy_logs() { fi done } 2>&1 | tee -a "_sys-info.log" + grep -q e <<< "$set_opts" && set -e # re-enable exit on errors # Magic string used to trim console logs at the appropriate level during wget MAGIC_STRING="-----END_OF_BUILD-----" -- 2.16.6