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

[source_changes at macosforge.org]

Revision: 8712
          http://trac.macosforge.org/projects/calendarserver/changeset/8712
Author:   glyph at apple.com
Date:     2012-02-16 04:29:38 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
home merging isn't supported by carddav yet, but accept the arg anyway so that the common service code doesn't need to distinguish

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

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

Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/carddav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/carddav/datastore/util.py	2012-02-16 12:29:35 UTC (rev 8711)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/carddav/datastore/util.py	2012-02-16 12:29:38 UTC (rev 8712)
@@ -121,7 +121,8 @@
 
 
 @inlineCallbacks
-def migrateHome(inHome, outHome, getComponent=lambda x:x.component()):
+def migrateHome(inHome, outHome, getComponent=lambda x:x.component(),
+                merge=None):
     yield outHome.removeAddressBookWithName("addressbook")
     outHome.properties().update(inHome.properties())
     inAddressbooks = yield inHome.addressbooks()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/6dc6e137/attachment-0001.html>