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

Relocation of sbang needs to be done when the spack prefix changes even if the install tree has not changed. (#17455)

Browse Source
This commit is contained in:
Patrick Gartung 2020-07-09 22:28:51 -05:00 committed by Todd Gamblin
parent ce772420dd
commit 69775fcc07
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/binary_distribution.py
View File

@ -602,7 +602,7 @@ def is_backup_file(file):
if not is_backup_file(text_name): if not is_backup_file(text_name):
text_names.append(text_name) text_names.append(text_name)
# If we are installing back to the same location don't replace anything # If we are not installing back to the same install tree do the relocation
if old_layout_root != new_layout_root: if old_layout_root != new_layout_root:
files_to_relocate = [os.path.join(workdir, filename) files_to_relocate = [os.path.join(workdir, filename)
for filename in buildinfo.get('relocate_binaries') for filename in buildinfo.get('relocate_binaries')
@ -656,6 +656,17 @@ def is_backup_file(file):
new_spack_prefix, new_spack_prefix,
prefix_to_prefix) prefix_to_prefix)
# If we are installing back to the same location
# relocate the sbang location if the spack directory changed
else:
if old_spack_prefix != new_spack_prefix:
relocate.relocate_text(text_names,
old_layout_root, new_layout_root,
old_prefix, new_prefix,
old_spack_prefix,
new_spack_prefix,
prefix_to_prefix)
def extract_tarball(spec, filename, allow_root=False, unsigned=False, def extract_tarball(spec, filename, allow_root=False, unsigned=False,
force=False): force=False):

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

@ -804,15 +804,17 @@ def relocate_text(
where they should be relocated where they should be relocated
""" """
# TODO: reduce the number of arguments (8 seems too much) # TODO: reduce the number of arguments (8 seems too much)
sbang_regex = r'#!/bin/bash {0}/bin/sbang'.format(orig_spack) orig_sbang = '#!/bin/bash {0}/bin/sbang'.format(orig_spack)
new_sbang = r'#!/bin/bash {0}/bin/sbang'.format(new_spack) new_sbang = '#!/bin/bash {0}/bin/sbang'.format(new_spack)
for file in files: for file in files:
_replace_prefix_text(file, orig_install_prefix, new_install_prefix) _replace_prefix_text(file, orig_install_prefix, new_install_prefix)
for orig_dep_prefix, new_dep_prefix in new_prefixes.items(): for orig_dep_prefix, new_dep_prefix in new_prefixes.items():
_replace_prefix_text(file, orig_dep_prefix, new_dep_prefix) _replace_prefix_text(file, orig_dep_prefix, new_dep_prefix)
_replace_prefix_text(file, orig_layout_root, new_layout_root) _replace_prefix_text(file, orig_layout_root, new_layout_root)
_replace_prefix_text(file, sbang_regex, new_sbang) # relocate the sbang location only if the spack directory changed
if orig_spack != new_spack:
_replace_prefix_text(file, orig_sbang, new_sbang)
def relocate_text_bin( def relocate_text_bin(