From f1638faa3a669c91f93e866a34ce19424fb34b7f Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Sat, 8 Jun 2024 08:18:34 -0400
Subject: [PATCH] correct placement of error check override

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

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 0d52e5c16..9ee4058f9 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -349,11 +349,11 @@ masterunlock() {
 
 phases_pillar_2_4_80() {
   echo "Checking if pillar value: elasticsearch.index_settings.global_overrides.index_template.phases exists"
+  set +e
   PHASES=$(so-yaml.py get /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases)
   case $? in
     0)
     so-yaml.py remove /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases
-    set +e
     read -r -d '' msg <<- EOF
 Found elasticsearch.index_settings.global_overrides.index_template.phases was set to:
 ${PHASES}
@@ -363,11 +363,11 @@ To set policies, navigate to the SOC Grid Configuration UI at elasticsearch.inde
 A backup of all pillar files was saved to /nsm/backup/
 EOF
     FINAL_MESSAGE_QUEUE+=("$msg")
-    set -e
     ;;
     2) echo "Pillar elasticsearch.index_settings.global_overrides.index_template.phases does not exist. No action taken." ;;
     *) echo "so-yaml.py returned something other than 0 or 2 exit code" ;; # we shouldn't see this
   esac
+  set -e
 }
 
 preupgrade_changes() {