1 From f128cbeead687bfc6532cc1f2cc3e2dc5a2b5b30 Mon Sep 17 00:00:00 2001
2 From: Alexander Kanavin <alex.kanavin@gmail.com>
3 Date: Wed, 5 Sep 2018 16:46:52 +0200
4 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
6 prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
7 It is not an error per se, but it breaks subprocess.check_output().
9 Upstream-Status: Inappropriate [oe-core specific]
10 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 giscanner/shlibs.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
15 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
16 index 01d21a3..3bd3250 100644
17 --- a/giscanner/shlibs.py
18 +++ b/giscanner/shlibs.py
19 @@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries):
20 args.extend(['otool', '-L', binary.args[0]])
22 args.extend(['ldd', binary.args[0]])
23 - output = subprocess.check_output(args)
24 + output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
25 if isinstance(output, bytes):
26 output = output.decode("utf-8", "replace")
