[CalendarServer-changes] [7507] CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py

[source_changes at macosforge.org]

Revision: 7507
          http://trac.macosforge.org/projects/calendarserver/changeset/7507
Author:   wsanchez at apple.com
Date:     2011-05-19 17:22:35 -0700 (Thu, 19 May 2011)
Log Message:
-----------
Catch ImportError when creating directory resource.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py

Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2011-05-20 00:21:05 UTC (rev 7506)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2011-05-20 00:22:35 UTC (rev 7507)
@@ -87,7 +87,12 @@
             params = config.DirectoryAddressBook.params.copy()
             params["directoryBackedAddressBook"] = self
 
-            self.directory = directoryClass(params)
+            try:
+                self.directory = directoryClass(params)
+            except ImportError, e:
+                log.error("Unable to set up directory address book: %s" % (e,))
+                return succeed(None)
+
             return self.directory.createCache()
             
             #print ("DirectoryBackedAddressBookResource.provisionDirectory: provisioned")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110519/131621a5/attachment-0001.html>