[CalendarServer-changes] [4499] CalendarServer/branches/more-deferreds-3

[source_changes at macosforge.org]

Revision: 4499
          http://trac.macosforge.org/projects/calendarserver/changeset/4499
Author:   william_short at apple.com
Date:     2009-08-13 12:23:02 -0700 (Thu, 13 Aug 2009)
Log Message:
-----------
fix one more getChild call

Modified Paths:
--------------
    CalendarServer/branches/more-deferreds-3/bin/caldavd
    CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/processing.py

Modified: CalendarServer/branches/more-deferreds-3/bin/caldavd
===================================================================
--- CalendarServer/branches/more-deferreds-3/bin/caldavd	2009-08-13 19:23:02 UTC (rev 4498)
+++ CalendarServer/branches/more-deferreds-3/bin/caldavd	2009-08-13 19:23:02 UTC (rev 4499)
@@ -120,4 +120,4 @@
 
 echo exec "${python}" "${twistdpath}" "${twistd_reactor}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${profile} "${child_reactor}";
 
-exec "${python}" "${twistdpath}" ${twistd_reactor} ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${profile} ${child_reactor};
+exec "${python}" "${twistdpath}" ${twistd_reactor} -b ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${profile} ${child_reactor};

Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/processing.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/processing.py	2009-08-13 19:23:02 UTC (rev 4498)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/processing.py	2009-08-13 19:23:02 UTC (rev 4499)
@@ -632,7 +632,7 @@
         """
         
         from twistedcaldav.method.delete_common import DeleteResource
-        delchild = collection.getChild(name)
+        delchild = yield collection.getChild(name)
         childURL = joinURL(collURL, name)
         self.request._rememberResource(delchild, childURL)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090813/d884b787/attachment.html>