]> git.notmuchmail.org Git - notmuch/commitdiff
find_library does not read LD_LIBRARY_PATH, but CDLL does.
authorCedric Cabessa <ced@ryick.net>
Mon, 5 Apr 2010 01:03:51 +0000 (03:03 +0200)
committerCedric Cabessa <ced@ryick.net>
Mon, 5 Apr 2010 01:03:51 +0000 (03:03 +0200)
cnotmuch/globals.py

index ef2686fc5520ee7a88083b021fcdc072ce825f3f..fa20ae81e6be43653b572c1479423fc7ac06c5a0 100644 (file)
@@ -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):