[CalendarServer-changes] [8758] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 8758
          http://trac.macosforge.org/projects/calendarserver/changeset/8758
Author:   sagen at apple.com
Date:     2012-02-22 08:40:08 -0800 (Wed, 22 Feb 2012)
Log Message:
-----------
Only store original CUA if V1Compatibility is enabled

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/test/test_icalendar.py

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2012-02-22 15:28:18 UTC (rev 8757)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2012-02-22 16:40:08 UTC (rev 8758)
@@ -2540,9 +2540,10 @@
 
                 if toUUID:
                     # Store the original CUA if http(s) or /path:
-                    if cuaddr.startswith("http") or cuaddr.startswith("/"):
-                        prop.setParameter("CALENDARSERVER-OLD-CUA",
-                            prop.value())
+                    if config.Scheduling.Options.V1Compatibility:
+                        if cuaddr.startswith("http") or cuaddr.startswith("/"):
+                            prop.setParameter("CALENDARSERVER-OLD-CUA",
+                                prop.value())
 
                     # Always re-write value to urn:uuid
                     prop.setValue("urn:uuid:%s" % (guid,))

Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2012-02-22 15:28:18 UTC (rev 8757)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2012-02-22 16:40:08 UTC (rev 8758)
@@ -20,6 +20,7 @@
 
 from twisted.trial.unittest import SkipTest
 
+from twistedcaldav.config import config
 from twistedcaldav.ical import Component, Property, InvalidICalendarDataError
 from twistedcaldav.instance import InvalidOverriddenInstanceError
 import twistedcaldav.test.util
@@ -6071,6 +6072,7 @@
                 ),
             }[cuaddr]
 
+        self.patch(config.Scheduling.Options, "V1Compatibility", True)
         component.normalizeCalendarUserAddresses(lookupFunction, None, toUUID=True)
 
         # /principal CUAs are not stored in CALENDARSERVER-OLD-CUA
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120222/2a55c16e/attachment.html>