From 32877ebaceccffe4096c8c25e9a143b8cc81757f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 27 Jan 2010 07:28:33 -1000 Subject: Make sure we always check /lib64 and /lib in find_library (#555669). LD_LIBRARY_PATH ended up being /tmp/updates on my test system, so make sure we always check the default library paths in find_library(). --- pyudev.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pyudev.py') diff --git a/pyudev.py b/pyudev.py index b6e5ea950..58ea074d8 100644 --- a/pyudev.py +++ b/pyudev.py @@ -9,11 +9,12 @@ from ctypes import * # XXX this one may need some tweaking... def find_library(name, somajor=0): env = os.environ.get("LD_LIBRARY_PATH") + common = ["/lib64", "/lib"] if env: - libdirs = env.split(":") + libdirs = env.split(":") + common else: - libdirs = ["/lib64", "/lib"] + libdirs = common libdirs = filter(os.path.isdir, libdirs) @@ -29,7 +30,6 @@ def find_library(name, somajor=0): else: return None - # find the udev library libudev = find_library(name="udev", somajor=0) -- cgit