[CalendarServer-changes] [13429] CalendarServer/trunk/calendarserver/tools/resources.py

[source_changes at macosforge.org]

Revision: 13429
          http://trac.calendarserver.org//changeset/13429
Author:   dre at apple.com
Date:     2014-05-03 09:50:27 -0700 (Sat, 03 May 2014)
Log Message:
-----------
Don't fail if OD is absent

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/resources.py

Modified: CalendarServer/trunk/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/resources.py	2014-05-03 16:48:28 UTC (rev 13428)
+++ CalendarServer/trunk/calendarserver/tools/resources.py	2014-05-03 16:50:27 UTC (rev 13429)
@@ -37,10 +37,14 @@
 from twisted.python.util import switchUID
 from twistedcaldav.config import config, ConfigurationError
 from txdav.who.util import directoryFromConfig
-from twext.who.opendirectory import (
-    DirectoryService as OpenDirectoryService
-)
 
+try:
+    from twext.who.opendirectory import (
+        DirectoryService as OpenDirectoryService
+    )
+except ImportError:
+    pass
+
 log = Logger()
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140503/d5716542/attachment.html>