[CalendarServer-changes] [7651] CalendarServer/trunk/contrib/migration/calendarmigrator.py

[source_changes at macosforge.org]

Revision: 7651
          http://trac.macosforge.org/projects/calendarserver/changeset/7651
Author:   sagen at apple.com
Date:     2011-06-23 09:32:32 -0700 (Thu, 23 Jun 2011)
Log Message:
-----------
If only CardDAV was enabled before, only start addressbook now.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2011-06-23 16:11:19 UTC (rev 7650)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2011-06-23 16:32:32 UTC (rev 7651)
@@ -305,8 +305,9 @@
     """
 
     if enableCalDAV or enableCardDAV:
-        log("Starting service via serveradmin")
-        ret = subprocess.call([SERVER_ADMIN, "start", "calendar"])
+        serviceName = "calendar" if enableCalDAV else "addressbook"
+        log("Starting service via serveradmin start %s" % (serviceName,))
+        ret = subprocess.call([SERVER_ADMIN, "start", serviceName])
         log("serveradmin exited with %d" % (ret,))
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110623/c70814d2/attachment.html>