[CalendarServer-changes] [4774] CalendarServer/branches/release/CalendarServer-2.4-dev

[source_changes at macosforge.org]

Revision: 4774
          http://trac.macosforge.org/projects/calendarserver/changeset/4774
Author:   glyph at apple.com
Date:     2009-11-18 14:34:24 -0800 (Wed, 18 Nov 2009)
Log Message:
-----------
Pulled up r4762 from trunk, with build.sh dependencies pulled into 'run'.

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/4762

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-2.4-dev/run
    CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/scheduling/implicit.py

Property Changed:
----------------
    CalendarServer/branches/release/CalendarServer-2.4-dev/


Property changes on: CalendarServer/branches/release/CalendarServer-2.4-dev
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4439-4440,4448,4450,4464,4473-4475,4602,4711-4712,4716-4717,4739-4742,4748-4752,4758
   + /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4439-4440,4448,4450,4464,4473-4475,4602,4711-4712,4716-4717,4739-4742,4748-4752,4758,4762

Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/run
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/run	2009-11-18 20:38:45 UTC (rev 4773)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/run	2009-11-18 22:34:24 UTC (rev 4774)
@@ -727,7 +727,7 @@
 
 caldavtester="${top}/CalDAVTester";
 
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4449;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4761;
 
 #
 # PyFlakes

Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/scheduling/implicit.py	2009-11-18 20:38:45 UTC (rev 4773)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/scheduling/implicit.py	2009-11-18 22:34:24 UTC (rev 4774)
@@ -283,11 +283,16 @@
             if attendee.params().get("PARTSTAT", ["NEEDS-ACTION"])[0] == "NEEDS-ACTION":
                 self.request.suppressRefresh = True
         
-        self.request.doing_attendee_refresh = True
+        if hasattr(self.request, "doing_attendee_refresh"):
+            self.request.doing_attendee_refresh += 1
+        else:
+            self.request.doing_attendee_refresh = 1
         try:
             result = (yield self.processRequests())
         finally:
-            delattr(self.request, "doing_attendee_refresh")
+            self.request.doing_attendee_refresh -= 1
+            if self.request.doing_attendee_refresh == 0:
+                delattr(self.request, "doing_attendee_refresh")
 
         if result:
             if not hasattr(self.request, "extendedLogItems"):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091118/c02b88b4/attachment-0001.html>