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

[source_changes at macosforge.org]

Revision: 8767
          http://trac.macosforge.org/projects/calendarserver/changeset/8767
Author:   sagen at apple.com
Date:     2012-02-28 10:21:45 -0800 (Tue, 28 Feb 2012)
Log Message:
-----------
Don't stop a data upgrade because of invalid data; log and proceed.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2012-02-28 02:12:51 UTC (rev 8766)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2012-02-28 18:21:45 UTC (rev 8767)
@@ -1272,6 +1272,10 @@
 
 
         after = {
+            ".calendarserver_version" :
+            {
+                "@contents" : "2",
+            },
             "calendars" :
             {
                 "__uids__" :
@@ -1322,12 +1326,7 @@
         config.DocumentRoot = root
         config.DataRoot = root
 
-        try:
-            (yield self.doUpgrade(config))
-        except UpgradeError:
-            pass
-        else:
-            self.fail("UpgradeError expected")
+        (yield self.doUpgrade(config))
 
         self.assertTrue(self.verifyHierarchy(root, after))
 

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2012-02-28 02:12:51 UTC (rev 8766)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2012-02-28 18:21:45 UTC (rev 8767)
@@ -566,7 +566,7 @@
     createMailTokensDatabase(config, uid, gid)
 
     if errorOccurred:
-        raise UpgradeError("Data upgrade failed, see error.log for details")
+        log.warn("Data upgrade encountered errors but will proceed; see error.log for details")
 
 
 def normalizeCUAddrs(data, directory, cuaCache):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120228/503b274d/attachment.html>