[CalendarServer-changes] [4740] CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Nov 11 10:11:17 PST 2009


Revision: 4740
          http://trac.macosforge.org/projects/calendarserver/changeset/4740
Author:   wsanchez at apple.com
Date:     2009-11-11 10:11:16 -0800 (Wed, 11 Nov 2009)
Log Message:
-----------
Convert DatabaseError to DirectoryError.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2009-11-11 18:10:42 UTC (rev 4739)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2009-11-11 18:11:16 UTC (rev 4740)
@@ -30,6 +30,8 @@
 from twistedcaldav.config import config
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.log import Logger
+from twistedcaldav.sql import DatabaseError
+from twistedcaldav.directory.directory import DirectoryError
 from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
 from twistedcaldav.directory.calendaruserproxy import CalendarUserProxyDatabase
 
@@ -97,7 +99,10 @@
             log.error("Ignoring file %r because it is not a repository builder file" % (self.xmlFile,))
             return
         self._parseXML(accounts_node)
-        self._updateExternalDatabases()
+        try:
+            self._updateExternalDatabases()
+        except DatabaseError, e:
+            raise DirectoryError(e)
 
     def _updateExternalDatabases(self):
         resourceInfoDatabase = ResourceInfoDatabase(config.DataRoot)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091111/46118f09/attachment.html>


More information about the calendarserver-changes mailing list