[CalendarServer-changes] [4839] CalendarServer/trunk/bin

[source_changes at macosforge.org]

Revision: 4839
          http://trac.macosforge.org/projects/calendarserver/changeset/4839
Author:   wsanchez at apple.com
Date:     2009-12-07 16:23:25 -0800 (Mon, 07 Dec 2009)
Log Message:
-----------
Default to dev plist when running from source tree

Modified Paths:
--------------
    CalendarServer/trunk/bin/calendarserver_export
    CalendarServer/trunk/bin/calendarserver_manage_principals
    CalendarServer/trunk/bin/calendarserver_warmup

Modified: CalendarServer/trunk/bin/calendarserver_export
===================================================================
--- CalendarServer/trunk/bin/calendarserver_export	2009-12-07 23:23:09 UTC (rev 4838)
+++ CalendarServer/trunk/bin/calendarserver_export	2009-12-08 00:23:25 UTC (rev 4839)
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 ##
 # Copyright (c) 2006-2007 Apple Inc. All rights reserved.
 #
@@ -37,5 +38,7 @@
         if child.wait() == 0:
             sys.path[0:0] = path.split(":")
 
+        sys.argv[1:1] = ["-f", join(home, "conf", "caldavd-dev.plist")]
+
     from calendarserver.tools.export import main
     main()

Modified: CalendarServer/trunk/bin/calendarserver_manage_principals
===================================================================
--- CalendarServer/trunk/bin/calendarserver_manage_principals	2009-12-07 23:23:09 UTC (rev 4838)
+++ CalendarServer/trunk/bin/calendarserver_manage_principals	2009-12-08 00:23:25 UTC (rev 4839)
@@ -16,7 +16,6 @@
 # limitations under the License.
 ##
 
-from __future__ import with_statement
 import sys
 
 #PYTHONPATH
@@ -39,5 +38,7 @@
         if child.wait() == 0:
             sys.path[0:0] = path.split(":")
 
+        sys.argv[1:1] = ["-f", join(home, "conf", "caldavd-dev.plist")]
+
     from calendarserver.tools.principals import main
     main()

Modified: CalendarServer/trunk/bin/calendarserver_warmup
===================================================================
--- CalendarServer/trunk/bin/calendarserver_warmup	2009-12-07 23:23:09 UTC (rev 4838)
+++ CalendarServer/trunk/bin/calendarserver_warmup	2009-12-08 00:23:25 UTC (rev 4839)
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 ##
 # Copyright (c) 2006-2007 Apple Inc. All rights reserved.
 #
@@ -37,5 +38,7 @@
         if child.wait() == 0:
             sys.path[0:0] = path.split(":")
 
+        sys.argv[1:1] = ["-f", join(home, "conf", "caldavd-dev.plist")]
+
     from calendarserver.tools.warmup import main
     main()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091207/dd092ab9/attachment-0001.html>