hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ensure view projections for extensions always point to extendee (#33848)

Browse source
This commit is contained in:
Greg Becker 2022-11-11 09:59:23 -08:00 committed by GitHub
parent d49c992b23
commit 2d2c591633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/spack/spack/filesystem_view.py
View file

@ -493,9 +493,14 @@ def get_projection_for_spec(self, spec):
Relies on the ordering of projections to avoid ambiguity.
"""
spec = spack.spec.Spec(spec)
proj = spack.projections.get_projection(self.projections, spec)
locator_spec = spec
if spec.package.extendee_spec:
locator_spec = spec.package.extendee_spec
proj = spack.projections.get_projection(self.projections, locator_spec)
if proj:
return os.path.join(self._root, spec.format(proj))
return os.path.join(self._root, locator_spec.format(proj))
return self._root
def get_all_specs(self):
@ -743,6 +748,10 @@ def get_projection_for_spec(self, spec):
Relies on the ordering of projections to avoid ambiguity.
"""
spec = spack.spec.Spec(spec)
if spec.package.extendee_spec:
spec = spec.package.extendee_spec
proj = spack.projections.get_projection(self.projections, spec)
if proj:
return os.path.join(self._root, spec.format(proj))