From 0056feaa21489910fa4ef18668602e1f0967ea6c Mon Sep 17 00:00:00 2001 From: Niklas Hambüchen Date: Sat, 13 May 2017 18:54:36 +0200 Subject: python: Remove all uses of find_library. Fixes #1450593 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8 BUG: 1450593 Signed-off-by: Niklas Hambüchen --- geo-replication/syncdaemon/libcxattr.py | 3 +-- geo-replication/syncdaemon/libgfchangelog.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'geo-replication') diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py index 3671e102c7..f576648b7a 100644 --- a/geo-replication/syncdaemon/libcxattr.py +++ b/geo-replication/syncdaemon/libcxattr.py @@ -10,7 +10,6 @@ import os from ctypes import CDLL, create_string_buffer, get_errno -from ctypes.util import find_library class Xattr(object): @@ -25,7 +24,7 @@ class Xattr(object): sizes we expect """ - libc = CDLL(find_library("c"), use_errno=True) + libc = CDLL("libc.so.6", use_errno=True) @classmethod def geterrno(cls): diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py index 334f5e9eaf..da12438d06 100644 --- a/geo-replication/syncdaemon/libgfchangelog.py +++ b/geo-replication/syncdaemon/libgfchangelog.py @@ -11,12 +11,11 @@ import os from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \ get_errno, byref, c_ulong -from ctypes.util import find_library from syncdutils import ChangelogException, ChangelogHistoryNotAvailable class Changes(object): - libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, + libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) @classmethod -- cgit