[CalendarServer-changes] [8575] CalendarServer/branches/users/glyph/parallel-upgrade_to_1/ twistedcaldav/upgrade.py

[source_changes at macosforge.org]

Revision: 8575
          http://trac.macosforge.org/projects/calendarserver/changeset/8575
Author:   glyph at apple.com
Date:     2012-01-24 00:55:59 -0800 (Tue, 24 Jan 2012)
Log Message:
-----------
Add a spawner argument.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twistedcaldav/upgrade.py

Modified: CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twistedcaldav/upgrade.py	2012-01-24 08:55:38 UTC (rev 8574)
+++ CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twistedcaldav/upgrade.py	2012-01-24 08:55:59 UTC (rev 8575)
@@ -88,7 +88,7 @@
 #
 
 @inlineCallbacks
-def upgrade_to_1(config, directory):
+def upgrade_to_1(config, spawner, directory):
 
     errorOccurred = False
 
@@ -559,7 +559,7 @@
 
 
 @inlineCallbacks
-def upgrade_to_2(config, directory):
+def upgrade_to_2(config, spawner, directory):
     
     errorOccurred = False
 
@@ -675,7 +675,7 @@
 ]
 
 @inlineCallbacks
-def upgradeData(config):
+def upgradeData(config, spawner=None):
 
     directory = getDirectory()
 
@@ -707,7 +707,7 @@
     for version, method in upgradeMethods:
         if onDiskVersion < version:
             log.warn("Upgrading to version %d" % (version,))
-            (yield method(config, directory))
+            (yield method(config, spawner, directory))
             log.warn("Upgraded to version %d" % (version,))
             with open(versionFilePath, "w") as verFile:
                 verFile.write(str(version))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120124/be18499c/attachment-0001.html>