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

[source_changes at macosforge.org]

Revision: 4775
          http://trac.macosforge.org/projects/calendarserver/changeset/4775
Author:   glyph at apple.com
Date:     2009-11-18 14:38:05 -0800 (Wed, 18 Nov 2009)
Log Message:
-----------
Pulled up r4760 from trunk (CalDAVTester dependency already recent enough from previous fix).

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

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/instance.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,4762
   + /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,4760,4762

Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/instance.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/instance.py	2009-11-18 22:34:24 UTC (rev 4774)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/instance.py	2009-11-18 22:38:05 UTC (rev 4775)
@@ -324,7 +324,7 @@
 
         # Make sure override RECURRENCE-ID is a valid instance of the master
         if got_master:
-            if str(rid) not in self.instances:
+            if str(rid) not in self.instances and compareDateTime(rid, limit) <= 0:
                 if self.ignoreInvalidInstances:
                     return
                 else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091118/b14c72d6/attachment.html>