[CalendarServer-changes] [8914] CalendarServer/trunk/txdav/caldav/datastore/util.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Mar 19 17:19:37 PDT 2012


Revision: 8914
          http://trac.macosforge.org/projects/calendarserver/changeset/8914
Author:   sagen at apple.com
Date:     2012-03-19 17:19:37 -0700 (Mon, 19 Mar 2012)
Log Message:
-----------
Don't stop for any exception when parsing data to migrate

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/util.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py	2012-03-19 21:23:52 UTC (rev 8913)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py	2012-03-20 00:19:37 UTC (rev 8914)
@@ -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(),
@@ -165,6 +165,7 @@
             bad_count += 1
             continue
 
+
         if ctype not in ("VEVENT", "VTODO"):
             log.error("Migration skipping unsupported (%s) calendar object %r"
                       % (ctype, calendarObject))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120319/3c4a3ee5/attachment-0001.html>


More information about the calendarserver-changes mailing list