Set variable to skip trap if error already handled

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

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