[CalendarServer-changes] [8917] CalendarServer/branches/users/wsanchez/d2/txdav/caldav/datastore/ util.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 20 15:53:45 PDT 2012


Revision: 8917
          http://trac.macosforge.org/projects/calendarserver/changeset/8917
Author:   sagen at apple.com
Date:     2012-03-20 15:53:44 -0700 (Tue, 20 Mar 2012)
Log Message:
-----------
Pull up r8194 from trunk (Don't stop for any exception when parsing data to migrate)

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/8194

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/d2/txdav/caldav/datastore/util.py

Modified: CalendarServer/branches/users/wsanchez/d2/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/wsanchez/d2/txdav/caldav/datastore/util.py	2012-03-20 13:47:45 UTC (rev 8916)
+++ CalendarServer/branches/users/wsanchez/d2/txdav/caldav/datastore/util.py	2012-03-20 22:53:44 UTC (rev 8917)
@@ -155,8 +155,8 @@
     for calendarObject in (yield inCalendar.calendarObjects()):
         try:
             ctype = yield calendarObject.componentType()
-        except InvalidICalendarDataError, e:
-            log.error("  InvalidICalendarDataError: Failed to migrate calendar object: %s/%s/%s (%s)" % (
+        except Exception, e: # Don't stop for any error
+            log.error("  Failed to migrate calendar object: %s/%s/%s (%s)" % (
                 inCalendar.ownerHome().name(),
                 inCalendar.name(),
                 calendarObject.name(),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120320/69873caf/attachment.html>


More information about the calendarserver-changes mailing list