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

Buildcache: pass string.encode('utf-8') for old_dir and new_dir to replace_prefix_bin. (#13114)

Browse Source 
This should fix a Python3 error from concatenating strings and bytes.
This commit is contained in:
Patrick Gartung 2019-10-09 20:36:47 -05:00 committed by GitHub
parent 469bef880a
commit 5b879459c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,7 +429,8 @@ def relocate_macho_binaries(path_names, old_dir, new_dir, allow_root):
modify_object_macholib(path_name, placeholder, new_dir) modify_object_macholib(path_name, placeholder, new_dir)
modify_object_macholib(path_name, old_dir, new_dir) modify_object_macholib(path_name, old_dir, new_dir)
if len(new_dir) <= len(old_dir): if len(new_dir) <= len(old_dir):
replace_prefix_bin(path_name, old_dir, new_dir) replace_prefix_bin(path_name, old_dir.encode('utf-8'),
new_dir.encode('utf-8'))
else: else:
tty.warn('Cannot do a binary string replacement' tty.warn('Cannot do a binary string replacement'
' with padding for %s' ' with padding for %s'