From: Cedric Cabessa <ced@ryick.net>
Date: Mon, 5 Apr 2010 01:03:51 +0000 (+0200)
Subject: find_library does not read LD_LIBRARY_PATH, but CDLL does.
X-Git-Tag: 0.3~121^2~10
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=f378f45893bb4263402008b2abd8aab522901fb6

find_library does not read LD_LIBRARY_PATH, but CDLL does.
---

diff --git a/cnotmuch/globals.py b/cnotmuch/globals.py
index ef2686fc..fa20ae81 100644
--- a/cnotmuch/globals.py
+++ b/cnotmuch/globals.py
@@ -3,17 +3,17 @@ from ctypes.util import find_library
 
 #-----------------------------------------------------------------------------
 #package-global instance of the notmuch library
-#TODO: lazy load this on first access?
-so = find_library('notmuch')
-if so is None:
-  raise ImportError("Could not find shared 'notmuch' library.")
-nmlib = CDLL(so)
+try:
+    nmlib = CDLL("libnotmuch.so.1")
+except:
+    raise ImportError("Could not find shared 'notmuch' library.")
+
 #-----------------------------------------------------------------------------
 class Enum(object):
-  """Provides ENUMS as "code=Enum(['a','b','c'])" where code.a=0 etc..."""
-  def __init__(self, names):
-    for number, name in enumerate(names):
-      setattr(self, name, number)
+    """Provides ENUMS as "code=Enum(['a','b','c'])" where code.a=0 etc..."""
+    def __init__(self, names):
+        for number, name in enumerate(names):
+            setattr(self, name, number)
 
 #-----------------------------------------------------------------------------
 class Status(Enum):