[CalendarServer-changes] [8535] CalendarServer/branches/users/glyph/skip-lonely-vtimezones

[source_changes at macosforge.org]

Revision: 8535
          http://trac.macosforge.org/projects/calendarserver/changeset/8535
Author:   glyph at apple.com
Date:     2012-01-13 14:03:25 -0800 (Fri, 13 Jan 2012)
Log Message:
-----------
Different test, although functionally the same behavior; instead of looking for uid(), check componentType().  (This will be None for VTIMEZONE.)

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/skip-lonely-vtimezones/txdav/caldav/datastore/util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/skip-lonely-vtimezones/

Modified: CalendarServer/branches/users/glyph/skip-lonely-vtimezones/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/glyph/skip-lonely-vtimezones/txdav/caldav/datastore/util.py	2012-01-13 22:03:23 UTC (rev 8534)
+++ CalendarServer/branches/users/glyph/skip-lonely-vtimezones/txdav/caldav/datastore/util.py	2012-01-13 22:03:25 UTC (rev 8535)
@@ -143,7 +143,10 @@
     bad_count = 0
     outCalendar.properties().update(inCalendar.properties())
     for calendarObject in (yield inCalendar.calendarObjects()):
-        if calendarObject.uid() is None:
+        ctype = yield calendarObject.componentType()
+        if ctype not in ("VEVENT", "VTODO"):
+            log.error("Migration skipping unsupported (%s) calendar object %r"
+                      % (ctype, calendarObject))
             continue
         try:
             # Must account for metadata
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120113/a6837a33/attachment-0001.html>