[CalendarServer-changes] [10082] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Sat Nov 17 17:54:18 PST 2012


Revision: 10082
          http://trac.calendarserver.org//changeset/10082
Author:   sagen at apple.com
Date:     2012-11-17 17:54:18 -0800 (Sat, 17 Nov 2012)
Log Message:
-----------
No-op commit for build purposes.  Nothing to see here.

Modified Paths:
--------------
    CalendarServer/trunk/README
    CalendarServer/trunk/contrib/migration/calendarmigrator.py
    CalendarServer/trunk/contrib/migration/calendarpromotion.py
    CalendarServer/trunk/contrib/migration/test/test_promotion.py

Modified: CalendarServer/trunk/README
===================================================================
--- CalendarServer/trunk/README	2012-11-18 01:45:34 UTC (rev 10081)
+++ CalendarServer/trunk/README	2012-11-18 01:54:18 UTC (rev 10082)
@@ -110,3 +110,4 @@
 8443 for HTTPS.  You should then be able to connect to the server
 using your web browser (eg. Safari, Firefox) or with a CalDAV client
 (eg. iCal).
+

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-11-18 01:45:34 UTC (rev 10081)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-11-18 01:54:18 UTC (rev 10082)
@@ -496,6 +496,16 @@
     # ConfigRoot is now always "Config"
     combined["ConfigRoot"] = "Config"
 
+    # Remove RunRoot and PIDFile keys so they use the new defaults
+    try:
+        del combined["RunRoot"]
+    except:
+        pass
+    try:
+        del combined["PIDFile"]
+    except:
+        pass
+
     return adminChanges
 
 

Modified: CalendarServer/trunk/contrib/migration/calendarpromotion.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarpromotion.py	2012-11-18 01:45:34 UTC (rev 10081)
+++ CalendarServer/trunk/contrib/migration/calendarpromotion.py	2012-11-18 01:54:18 UTC (rev 10082)
@@ -43,6 +43,15 @@
     plistData["DSN"] = ""
     plistData["ConfigRoot"] = "Config"
     plistData["DBImportFile"] = "/Library/Server/Calendar and Contacts/DataDump.sql"
+    # Remove RunRoot and PIDFile keys so they use the new defaults
+    try:
+        del plistData["RunRoot"]
+    except:
+        pass
+    try:
+        del plistData["PIDFile"]
+    except:
+        pass
 
 
 

Modified: CalendarServer/trunk/contrib/migration/test/test_promotion.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_promotion.py	2012-11-18 01:45:34 UTC (rev 10081)
+++ CalendarServer/trunk/contrib/migration/test/test_promotion.py	2012-11-18 01:54:18 UTC (rev 10082)
@@ -29,6 +29,8 @@
 
         orig = {
             "ignored" : "ignored",
+            "RunRoot" : "xyzzy",
+            "PIDFile" : "plugh",
         }
         expected = {
             "ignored" : "ignored",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121117/72d6d76f/attachment.html>


More information about the calendarserver-changes mailing list