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

fix relocation broken symlink, discovered in testing

Browse Source
This commit is contained in:
Gregory Becker 2023-04-03 16:07:32 -07:00
parent 7904d2f13a
commit 4fbb23b89e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/filesystem_view.py
View File

@ -27,7 +27,7 @@
SingleMergeConflictError, SingleMergeConflictError,
SourceMergeVisitor, SourceMergeVisitor,
) )
from llnl.util.symlink import symlink from llnl.util.symlink import islink, symlink
from llnl.util.tty.color import colorize from llnl.util.tty.color import colorize
import spack.config import spack.config
@ -63,7 +63,7 @@ def view_copy(src, dst, view, spec=None):
Use spec and view to generate relocations Use spec and view to generate relocations
""" """
shutil.copy2(src, dst) shutil.copy2(src, dst, follow_symlinks=False)
if spec and not spec.external: if spec and not spec.external:
# Not metadata, we have to relocate it # Not metadata, we have to relocate it
@ -95,6 +95,8 @@ def view_copy(src, dst, view, spec=None):
if spack.relocate.is_binary(dst): if spack.relocate.is_binary(dst):
spack.relocate.relocate_text_bin(binaries=[dst], prefixes=prefix_to_projection) spack.relocate.relocate_text_bin(binaries=[dst], prefixes=prefix_to_projection)
elif islink(dst):
spack.relocate.relocate_links(links=[dst], prefix_to_prefix=prefix_to_projection)
else: else:
prefix_to_projection[spack.store.layout.root] = root prefix_to_projection[spack.store.layout.root] = root
prefix_to_projection[orig_sbang] = new_sbang prefix_to_projection[orig_sbang] = new_sbang