Revision
6464
Author
sagen@apple.com
Date
2010-10-25 10:19:55 -0700 (Mon, 25 Oct 2010)

Log Message

Handle the case where there is neither calendar nor addressbook data

Modified Paths

Diff

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py (6463 => 6464)


--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-10-25 16:48:50 UTC (rev 6463)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-10-25 17:19:55 UTC (rev 6464)
@@ -426,7 +426,8 @@
     addressbookDataInDefaultLocation = True
     uid = -1
     gid = -1
-    newServerRoot = None
+    newServerRoot = None # actual path
+    newServerRootValue = NEW_SERVER_ROOT # value to put in plist
 
     oldCalConfigDir = os.path.join(options.sourceRoot, CALDAVD_CONFIG_DIR)
     oldCalPlistPath = os.path.join(oldCalConfigDir, CALDAVD_PLIST)