Revision
9316
Author
sagen@apple.com
Date
2012-05-30 13:37:14 -0700 (Wed, 30 May 2012)

Log Message

Migration will now go ahead and merge in previous system config, even if new plist exists

Modified Paths

Diff

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py (9315 => 9316)


--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-05-30 20:16:59 UTC (rev 9315)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-05-30 20:37:14 UTC (rev 9316)
@@ -291,11 +291,9 @@
 
     newConfigDir = os.path.join(options.targetRoot, NEW_CONFIG_DIR)
     newConfigFile = os.path.join(newConfigDir, CALDAVD_PLIST)
-    if os.path.exists(newConfigDir):
-        if os.path.exists(newConfigFile):
-            log("Calendar configuration already exists in %s" % (newConfigDir,))
-            return
-    else:
+
+    # Create config directory if it doesn't exist
+    if not os.path.exists(newConfigDir):
         os.mkdir(newConfigDir)
 
     defaultConfig = os.path.join(SERVER_APP_ROOT, CALDAVD_CONFIG_DIR, CALDAVD_PLIST)