From 021df82e8fb30e843e0b29d38827448d430e61af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20Tint=C3=B3?= <oriol.tinto@lmu.de>
Date: Thu, 23 Mar 2023 16:50:31 +0100
Subject: [PATCH] Fix problem with $SPACK_DISABLE_LOCAL_CONFIG
---
platforms/common/spack_utils.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/platforms/common/spack_utils.sh b/platforms/common/spack_utils.sh
index b4708e9..1046273 100644
--- a/platforms/common/spack_utils.sh
+++ b/platforms/common/spack_utils.sh
@@ -37,12 +37,16 @@ function load_spack() {
export SPACK_USER_CACHE_PATH=$7 # i.e.: ${SPACK_ROOT}/spack_user_cache_path
export SPACK_USER_CONFIG_PATH=$8 # i.e.: ${SPACK_ROOT}/spack_user_config_path
+ if [ "$SPACK_DISABLE_LOCAL_CONFIG" != "True" ]; then
+ unset SPACK_DISABLE_LOCAL_CONFIG
+ fi
+
echo "SPACK_INIT_CMD = $SPACK_INIT_CMD"
echo "SPACK_ROOT = $SPACK_ROOT"
echo "SPACK_URL = $SPACK_URL"
echo "SPACK_BRANCH = $SPACK_BRANCH"
echo "SPACK_COMPILER = $SPACK_COMPILER"
- echo "SPACK_DISABLE_LOCAL_CONFIG = $SPACK_DISABLE_LOCAL_CONFIG"
+ echo "SPACK_DISABLE_LOCAL_CONFIG = ${SPACK_DISABLE_LOCAL_CONFIG:-False}"
echo "SPACK_USER_CACHE_PATH = $SPACK_USER_CACHE_PATH"
echo "SPACK_USER_CONFIG_PATH = $SPACK_USER_CONFIG_PATH"
--
GitLab