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

symlink relativization: determine target relative to the link directory (#13710)

Browse Source 
when making a package relative, relocate links relative to link directory

rather than the full link path (which includes the file name) because `os.path.relpath` expects a directory.
This commit is contained in:
Peter Scheibel 2019-11-13 17:51:57 -08:00 committed by Greg Becker
parent 045e9c905f
commit 3f861e18b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,11 +502,11 @@ def make_link_relative(cur_path_names, orig_path_names):
Change absolute links to be relative.
"""
for cur_path, orig_path in zip(cur_path_names, orig_path_names):
old_src = os.readlink(orig_path)
new_src = os.path.relpath(old_src, orig_path)
target = os.readlink(orig_path)
relative_target = os.path.relpath(target, os.path.dirname(orig_path))
os.unlink(cur_path)
os.symlink(new_src, cur_path)
os.symlink(relative_target, cur_path)
def make_macho_binaries_relative(cur_path_names, orig_path_names, old_dir,