[CalendarServer-changes] [4742] CalendarServer/trunk/calendarserver/tools/principals.py

[source_changes at macosforge.org]

Revision: 4742
          http://trac.macosforge.org/projects/calendarserver/changeset/4742
Author:   wsanchez at apple.com
Date:     2009-11-11 10:13:19 -0800 (Wed, 11 Nov 2009)
Log Message:
-----------
Catch DirectoryError and abort with an error message instead of a traceback.

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

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2009-11-11 18:11:26 UTC (rev 4741)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2009-11-11 18:13:19 UTC (rev 4742)
@@ -38,7 +38,7 @@
 from twistedcaldav.log import setLogLevelForNamespace
 from twistedcaldav.notify import installNotificationClient
 from twistedcaldav.static import CalendarHomeProvisioningFile
-from twistedcaldav.directory.directory import UnknownRecordTypeError
+from twistedcaldav.directory.directory import UnknownRecordTypeError, DirectoryError
 
 from calendarserver.tools.util import booleanArgument, autoDisableMemcached
 from calendarserver.tools.util import loadConfig, getDirectory
@@ -200,7 +200,10 @@
 
         os.umask(config.umask)
 
-        config.directory = getDirectory()
+        try:
+            config.directory = getDirectory()
+        except DirectoryError, e:
+            abort(e)
         autoDisableMemcached(config)
     except ConfigurationError, e:
         abort(e)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091111/4a1a13b6/attachment.html>