Move an unset to common.py

key4hep · Sep 9, 2023 · 1288b04 · 1288b04
1 parent 728b3fa
commit 1288b04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/key4hep-stack/common.py b/packages/key4hep-stack/common.py
@@ -31,7 +31,13 @@
 from shlex import quote as cmd_quote
 
 # List of env variables that will NOT be set
-IGNORE_VARS = set(["BOOST_ROOT", "SPACK_LOADED_HASHES"])
+IGNORE_VARS = set([
+    # Fix CMP0144 warnings: https://github.com/key4hep/key4hep-spack/issues/525
+    "BOOST_ROOT",
+    "SPACK_LOADED_HASHES",
+    # this fixes loading the local emacs: https://github.com/key4hep/key4hep-spack/issues/486
+    "XDG_DATA_DIRS",
+])
 
 def k4_setup_env_for_framework_tests(spec, env):
     """Setup for tests that need the run environment."""

diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py
@@ -143,9 +143,6 @@ def setup_run_environment(self, env):
         env.set("LC_ALL", "C")
         env.set("KEY4HEP_STACK", os.path.join(self.spec.prefix, "setup.sh"))
 
-        # this fixes loading the local emacs, see https://github.com/key4hep/key4hep-spack/issues/486
-        env.unset("XDG_DATA_DIRS")
-
         # set vdt, needed for root, see https://github.com/spack/spack/pull/37278
         env.prepend_path("CPATH", self.spec["vdt"].prefix.include)