zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path handling in prefix inspections (#35318)

Browse Source 
At least with ZSH, prefix inspections containing `./bin` result in a
`$PREFIX/./bin` and result in strange `$PATH` handling.

I.e., `module load git` will prepend `/path/to/git/./bin`, `which git`
will find the right executable, but `git --version` will print the
system one. Normalize the relative path to avoid this behavior.

See also spack/spack#31867.
This commit is contained in:
Matthias Wolf
2023-02-07 04:12:30 +01:00
committed by GitHub
parent 1d3a74d926
commit a7f39da5db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/util/environment.py
View File

@@ -912,7 +912,7 @@ def inspect_path(root, inspections, exclude=None):
env = EnvironmentModifications() env = EnvironmentModifications()
# Inspect the prefix to check for the existence of common directories # Inspect the prefix to check for the existence of common directories
for relative_path, variables in inspections.items(): for relative_path, variables in inspections.items():
expected = os.path.join(root, relative_path) expected = os.path.join(root, os.path.normpath(relative_path))
if os.path.isdir(expected) and not exclude(expected): if os.path.isdir(expected) and not exclude(expected):
for variable in variables: for variable in variables: