commit fd5cd5aa9883d346b102210004b8fafecc1ba457
author George Engelbrecht <engeg@google.com> Mon Nov 02 14:24:23 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Nov 03 07:15:11 2020 +0000
tree fda74bda3f575222f95d45e99e26a05f04e0b98b
parent 204dfbdf7b70d798cb01e8785e8de58615ef8d16

common: save the existing return value on cleanup

Currently this trap initiated function will not save the orginal return
value of the script. Save it and return it on exit.

BUG=chromium:1141907
TEST=unittest and manually on a signer
BRANCH=None
Signed-off-by: George Engelbrecht <engeg@google.com>
Change-Id: Icd807f4d153e4bcc1d309fbcea43c2b3344771ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2514560
Reviewed-by: Sean McAllister <smcallis@google.com>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>

scripts/image_signing/common.sh

diff --git a/scripts/image_signing/common.sh b/scripts/image_signing/common.sh
index 5f5287a..f1fd3ef 100644
--- a/scripts/image_signing/common.sh
+++ b/scripts/image_signing/common.sh
@@ -32,6 +32,8 @@
 # Performs clean up by executing actions in the cleanup_actions array in
 # reversed order.
 cleanup() {
+  # Save the existing return value.
+  rv=$?
   set +e
 
   while [ ${#cleanup_actions[*]} -gt 0 ]; do
@@ -39,6 +41,7 @@
   done
 
   set -e
+  return $rv
 }
 
 # ANSI color codes used when displaying messages.