[CalendarServer-changes] [4760] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4760
          http://trac.macosforge.org/projects/calendarserver/changeset/4760
Author:   cdaboo at apple.com
Date:     2009-11-17 21:07:02 -0800 (Tue, 17 Nov 2009)
Log Message:
-----------
Properly handle an instance that is overridden into a time-range even though the original
is outside the time-range.

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/twistedcaldav/instance.py

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2009-11-18 05:05:18 UTC (rev 4759)
+++ CalendarServer/trunk/support/build.sh	2009-11-18 05:07:02 UTC (rev 4760)
@@ -496,7 +496,7 @@
     false true true true 212;
 
   # Tool dependencies.  The code itself doesn't depend on these, but you probably want them.
-  svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4517;
+  svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4759;
   svn_get "Pyflakes" "${top}/Pyflakes" http://divmod.org/svn/Divmod/trunk/Pyflakes 17198;
 }
 

Modified: CalendarServer/trunk/twistedcaldav/instance.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/instance.py	2009-11-18 05:05:18 UTC (rev 4759)
+++ CalendarServer/trunk/twistedcaldav/instance.py	2009-11-18 05:07:02 UTC (rev 4760)
@@ -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/20091117/8bc74c5b/attachment.html>