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

Remove PatchelfError and change patchelf error message to a warning. (#15518)

Browse Source
This commit is contained in:
Patrick Gartung 2020-03-17 10:49:24 -05:00 committed by GitHub
parent 304f0e9ef1
commit be8841cbc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,15 +61,6 @@ def __init__(self, old_path, new_path):
super(BinaryTextReplaceException, self).__init__(msg, err_msg) super(BinaryTextReplaceException, self).__init__(msg, err_msg)
class PatchelfError(spack.error.SpackError):
"""
Raised when patchelf command returns a ProcessError.
"""
def __init__(self, error):
super(PatchelfError, self).__init__(error)
def get_patchelf(): def get_patchelf():
""" """
Returns the full patchelf binary path if available in $PATH. Returns the full patchelf binary path if available in $PATH.
@ -116,7 +107,7 @@ def get_existing_elf_rpaths(path_name):
rpaths = output.rstrip('\n').split(':') rpaths = output.rstrip('\n').split(':')
except ProcessError as e: except ProcessError as e:
msg = 'patchelf --print-rpath %s produced an error %s' % (path_name, e) msg = 'patchelf --print-rpath %s produced an error %s' % (path_name, e)
raise PatchelfError(msg) tty.warn(msg)
return rpaths return rpaths
@ -376,9 +367,9 @@ def modify_elf_object(path_name, new_rpaths):
patchelf('--force-rpath', '--set-rpath', '%s' % new_joined, patchelf('--force-rpath', '--set-rpath', '%s' % new_joined,
'%s' % path_name, output=str, error=str) '%s' % path_name, output=str, error=str)
except ProcessError as e: except ProcessError as e:
msg = 'patchelf --set-rpath %s failed with error %s' % (path_name, e) msg = 'patchelf --force-rpath --set-rpath %s failed with error %s' % (
raise PatchelfError(msg) path_name, e)
pass tty.warn(msg)
if os.path.exists(bak_path): if os.path.exists(bak_path):
os.remove(bak_path) os.remove(bak_path)