[CalendarServer-changes] [849] CalendarServer/trunk/twistedcaldav/static.py

[source_changes at macosforge.org]

Revision: 849
          http://trac.macosforge.org/projects/calendarserver/changeset/849
Author:   wsanchez at apple.com
Date:     2006-12-18 17:19:33 -0800 (Mon, 18 Dec 2006)

Log Message:
-----------
Return the provisioned child, not some deferred.

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

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2006-12-16 04:29:28 UTC (rev 848)
+++ CalendarServer/trunk/twistedcaldav/static.py	2006-12-19 01:19:33 UTC (rev 849)
@@ -423,7 +423,11 @@
     def provisionChild(self, name):
         child = CalendarHomeFile(self.fp.child(name).path, self, self.directory.recordWithShortName(self.recordType, name))
         if not child.exists():
-            return child.provisionDefaultCalendars()
+            # NOTE: provisionDefaultCalendars() returns a deferred, which we are ignoring.
+            # The result being that the default calendars will be present at some point
+            # in the future, not necessarily right now, and we don't have a way to wait
+            # on that to finish.
+            child.provisionDefaultCalendars()
         return child
 
     def createSimilarFile(self, path):

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061218/a355f038/attachment.html