From b44358fc26a58099c2d449cd998b09f7b3037309 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 23 Sep 2021 12:49:42 -0400
Subject: [PATCH] Add `set +e` after final upgrade steps and before
 post-upgrade checks

---
 salt/common/tools/sbin/soup | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 180fa7c38..fd325b8a4 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -1016,6 +1016,10 @@ main() {
 
     echo ""
     echo "Upgrade to $NEWVERSION complete."
+
+    # Everything beyond this is post-upgrade checking, don't fail past this point if something here causes an error
+    set +e
+
     echo "Checking the number of minions."
     NUM_MINIONS=$(ls /opt/so/saltstack/local/pillar/minions/*_*.sls | wc -l)
     if [[ $UPGRADESALT -eq 1 ]] && [[ $NUM_MINIONS -gt 1 ]]; then