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