From ed2781973cfe60c2d3187133684b39e7a752e738 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 6 Apr 2020 02:00:42 -0600 Subject: 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(-) (limited to 'lib') diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 1acbb64790..8069f51431 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -604,7 +604,8 @@ class EnvironmentModifications(object): # 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( -- cgit v1.2.3-60-g2f50