summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick Gartung <gartung@fnal.gov>2020-03-17 10:49:24 -0500
committerGitHub <noreply@github.com>2020-03-17 10:49:24 -0500
commitbe8841cbc5ced1d702fae194193b9029765c1a7e (patch)
treeeb1119558be0fc26f8174bebd90900b73c28da9d /lib
parent304f0e9ef1f0e811225d4cf5cce957d4431bb734 (diff)
downloadspack-be8841cbc5ced1d702fae194193b9029765c1a7e.tar.gz
spack-be8841cbc5ced1d702fae194193b9029765c1a7e.tar.bz2
spack-be8841cbc5ced1d702fae194193b9029765c1a7e.tar.xz
spack-be8841cbc5ced1d702fae194193b9029765c1a7e.zip
Remove PatchelfError and change patchelf error message to a warning. (#15518)
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/relocate.py17
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py
index 88b5a36c56..afbae543af 100644
--- a/lib/spack/spack/relocate.py
+++ b/lib/spack/spack/relocate.py
@@ -61,15 +61,6 @@ class BinaryTextReplaceException(spack.error.SpackError):
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():
"""
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(':')
except ProcessError as e:
msg = 'patchelf --print-rpath %s produced an error %s' % (path_name, e)
- raise PatchelfError(msg)
+ tty.warn(msg)
return rpaths
@@ -376,9 +367,9 @@ def modify_elf_object(path_name, new_rpaths):
patchelf('--force-rpath', '--set-rpath', '%s' % new_joined,
'%s' % path_name, output=str, error=str)
except ProcessError as e:
- msg = 'patchelf --set-rpath %s failed with error %s' % (path_name, e)
- raise PatchelfError(msg)
- pass
+ msg = 'patchelf --force-rpath --set-rpath %s failed with error %s' % (
+ path_name, e)
+ tty.warn(msg)
if os.path.exists(bak_path):
os.remove(bak_path)