[CalendarServer-changes] [11290] CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/ calendar_upgrade_from_3_to_4.py

[source_changes at macosforge.org]

Revision: 11290
          http://trac.calendarserver.org//changeset/11290
Author:   sagen at apple.com
Date:     2013-06-04 12:10:22 -0700 (Tue, 04 Jun 2013)
Log Message:
-----------
Fix for split-shared-collection upgrade issue

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py	2013-06-03 23:00:38 UTC (rev 11289)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py	2013-06-04 19:10:22 UTC (rev 11290)
@@ -174,7 +174,8 @@
                 if calendarHome is not None:
                     prop = WebDAVDocument.fromString(value).root_element
                     calendar = (yield calendarHome.childWithID(calendar_rid))
-                    yield calendar.setUsedForFreeBusy(prop == caldavxml.ScheduleCalendarTransp(caldavxml.Opaque()))
+                    if calendar is not None:
+                        yield calendar.setUsedForFreeBusy(prop == caldavxml.ScheduleCalendarTransp(caldavxml.Opaque()))
 
             # Always delete the rows so that batch processing works correctly
             yield Delete(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130604/fcd38b24/attachment.html>