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

[source_changes at macosforge.org]

Revision: 8707
          http://trac.macosforge.org/projects/calendarserver/changeset/8707
Author:   glyph at apple.com
Date:     2012-02-16 04:29:23 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
log message so at least we know which objects don't get migrated

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:20 UTC (rev 8706)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py	2012-02-16 12:29:23 UTC (rev 8707)
@@ -174,6 +174,10 @@
                 calendarObject.uid(), None, "schedule"
             )
             if mightConflict:
+                log.warn(
+                    "Not migrating object %s/%s/%s due to potential conflict" %
+                    (outHome.uid(), outCalendar.name(), calendarObject.name())
+                )
                 continue
         try:
             # Must account for metadata
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/bdbb92a4/attachment-0001.html>