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

[source_changes at macosforge.org]

Revision: 7060
          http://trac.macosforge.org/projects/calendarserver/changeset/7060
Author:   sagen at apple.com
Date:     2011-02-20 17:59:52 -0800 (Sun, 20 Feb 2011)
Log Message:
-----------
Workaround for problem with migrating inbox items for events with attachments (9023803)

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

Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py	2011-02-20 21:17:21 UTC (rev 7059)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py	2011-02-21 01:59:52 UTC (rev 7060)
@@ -136,6 +136,10 @@
             if outCalendar.objectResourcesHaveProperties():
                 outObject.properties().update(calendarObject.properties())
     
+            if inCalendar.name() == "inbox":
+                # Because of 9023803, skip attachment processing within inboxes
+                continue
+
             # Migrate attachments.
             for attachment in (yield calendarObject.attachments()):
                 name = attachment.name()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110220/b430b70a/attachment-0001.html>