From 359d7adf7ee07aa1adc09f2ad4aace1a0cd6316a Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 6 Apr 2020 02:00:42 -0600 Subject: [PATCH] Source devnull in environment_after_sourcing_files (closes #15775) (#15791) spack.util.environment_after_sourcing_files compares the local environment against a shell environment after having sourced a file; but this ends up including the default shell profile and rc, which might differ from the local environment. To change this, compare against the default shell environment, expressed here as 'source /dev/null'. --- lib/spack/spack/util/environment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 248a6d3c8c0..862f04f8eb6 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -602,7 +602,8 @@ def from_sourcing_file(filename, *arguments, **kwargs): # Compute the environments before and after sourcing before = sanitize( - dict(os.environ), blacklist=blacklist, whitelist=whitelist + environment_after_sourcing_files(os.devnull, **kwargs), + blacklist=blacklist, whitelist=whitelist ) file_and_args = (filename,) + arguments after = sanitize(