From c379822bf0df0fb52083392498feebc8e22ddc1e Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 11 May 2021 12:59:49 -0400
Subject: [PATCH] Set variable to skip trap if error already handled

---
 salt/common/tools/sbin/so-common | 1 +
 salt/common/tools/sbin/soup      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index 2b2bbf944..2b22ebbeb 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -334,6 +334,7 @@ run_check_net_err() {
 	exit_code=$?
 	
 	if [[ $exit_code -ne 0 ]]; then
+		ERR_HANDLED=true
 		echo "Command failed with error $exit_code"
 		echo "$err_msg"
 		exit $exit_code
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 364a769c0..c8601fe1a 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -35,6 +35,7 @@ check_err() {
   local lineno=$2
   local err_msg="Unhandled error occured, please check $SOUP_LOG for details."
 
+  [[ $ERR_HANDLED == true ]] && exit $exit_code
   if [[ $exit_code -ne 0 ]]; then
     printf '%s' "Soup failed on line $lineno with error $exit_code: "
     case $exit_code in