[CalendarServer-changes] [8472] CalendarServer/trunk/twistedcaldav/upgrade.py

[source_changes at macosforge.org]

Revision: 8472
          http://trac.macosforge.org/projects/calendarserver/changeset/8472
Author:   cdaboo at apple.com
Date:     2011-12-19 11:09:47 -0800 (Mon, 19 Dec 2011)
Log Message:
-----------
Ignore inbox item processing for principals that are not enabled for calendaring.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2011-12-17 00:06:31 UTC (rev 8471)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2011-12-19 19:09:47 UTC (rev 8472)
@@ -1035,7 +1035,11 @@
                         davxml.HRef.fromString("/principals/__uids__/%s/" % (uuid,))
                     )
 
-                    calendarHome = yield principal.calendarHome(request)
+                    try:
+                        calendarHome = yield principal.calendarHome(request)
+                    except AttributeError:
+                        # Not a calendar enabled principal, so ignore the inbox item
+                        calendarHome = None
                     if not calendarHome:
                         continue
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111219/e14d8c32/attachment.html>