From cbff231e0f28fa354150f2e30dafb5f1c512a559 Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Tue, 10 Feb 2026 12:04:39 +0000
Subject: [PATCH] Fix container python call in build script

Builds were failing in the container because the build script arguments
were being inadvertently passed to the python env script. Eliminated
this by placing the line that sources the script inside a dummy function.
---
 sorc/build_all.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index b11ccb81b7..4d46278d72 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -70,6 +70,7 @@ fi
 
 if [[ "${verbose}" == "YES" ]]; then
     set -x
+    declare -x PS4='+ $(basename ${BASH_SOURCE[0]:-${FUNCNAME[0]:-"Unknown"}})[${LINENO}]'
 fi
 
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
@@ -78,7 +79,11 @@ HOMEgfs=$(cd "${script_dir}" && git rev-parse --show-toplevel)
 export HOMEgfs
 
 if [[ -v SINGULARITY_CONTAINER ]]; then
-    source ${HOMEgfs}/dev/container/env/python-env.sh
+    # Need to use dummy function to avoid passing arg list
+    load_python_env() {
+        source "${HOMEgfs}/dev/container/env/python-env.sh"
+    }
+    load_python_env
 else
     echo "Sourcing global-workflow modules ..."
     source "${HOMEgfs}/dev/ush/gw_setup.sh"