summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-04-17 09:46:30 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-04-17 10:44:35 +0200
commit19c01aa7721149e6cd35a74c5618b5f2a5a26e93 (patch)
tree08f6811a6e27798daee0f8c235f325e6b818b8cd
parentbdf9f121eeae7fff3971184993a5f1b7bebc18f8 (diff)
downloadqutebrowser-19c01aa7721149e6cd35a74c5618b5f2a5a26e93.tar.gz
qutebrowser-19c01aa7721149e6cd35a74c5618b5f2a5a26e93.zip
mkvenv: Handle failing ldconfig
(cherry picked from commit 1b4daf7c37782bf6a63814c5e9cdc0bebec559ea)
-rwxr-xr-xscripts/mkvenv.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index 51b10d254..31b185fe1 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -271,7 +271,13 @@ def apply_xcb_util_workaround(
print("Workaround not needed: Not installing Qt 5.15.")
return
- libs = _find_libs()
+ try:
+ libs = _find_libs()
+ except subprocess.CalledProcessError as e:
+ utils.print_error(
+ f'Workaround failed: ldconfig exited with status {e.returncode}')
+ return
+
abi_type = 'libc6,x86-64' # the only one PyQt wheels are available for
if ('libxcb-util.so.1', abi_type) in libs: