From 08c21e4e74624daf11774d5f16b04f3d9544cbdc Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Fri, 12 Jun 2020 13:38:33 -0500 Subject: Buildcache: Fix bug in binary string replacement (#17075) * Fix bug in binary string replacement that results in padding being added multiple times * Update comment * Update comment again --- lib/spack/spack/relocate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 01a60db6ba..56e7c6632c 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -846,7 +846,11 @@ def relocate_text_bin( for old_dep_prefix, new_dep_prefix in new_prefixes.items(): if len(new_dep_prefix) <= len(old_dep_prefix): _replace_prefix_bin(binary, old_dep_prefix, new_dep_prefix) - _replace_prefix_bin(binary, orig_spack, new_spack) + _replace_prefix_bin(binary, orig_install_prefix, new_install_prefix) + + # Note: Replacement of spack directory should not be done. This causes + # an incorrect replacement path in the case where the install root is a + # subdirectory of the spack directory. def is_relocatable(spec): -- cgit v1.2.3-60-g2f50