[CalendarServer-changes] [8704] CalendarServer/branches/users/glyph/migrate-merge

[source_changes at macosforge.org]

Revision: 8704
          http://trac.macosforge.org/projects/calendarserver/changeset/8704
Author:   glyph at apple.com
Date:     2012-02-16 04:29:14 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
fix test, don't delete default collections on merge

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/migrate-merge/

Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py	2012-02-16 12:29:11 UTC (rev 8703)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py	2012-02-16 12:29:14 UTC (rev 8704)
@@ -319,10 +319,12 @@
     @return: a L{Deferred} that fires with C{None} when the migration is
         complete.
     """
-    yield outHome.removeCalendarWithName("calendar")
-    if config.RestrictCalendarsToOneComponentType:
-        yield outHome.removeCalendarWithName("tasks")
-    yield outHome.removeCalendarWithName("inbox")
+    if not merge:
+        yield outHome.removeCalendarWithName("calendar")
+        if config.RestrictCalendarsToOneComponentType:
+            yield outHome.removeCalendarWithName("tasks")
+        yield outHome.removeCalendarWithName("inbox")
+
     outHome.properties().update(inHome.properties())
     inCalendars = yield inHome.calendars()
     for calendar in inCalendars:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/21f6ae4e/attachment-0001.html>