[CalendarServer-changes] [5305] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5305
          http://trac.macosforge.org/projects/calendarserver/changeset/5305
Author:   wsanchez at apple.com
Date:     2010-03-15 10:52:04 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Clean up config file usage when -a (CardDAV mode) is on.

Modified Paths:
--------------
    CalendarServer/trunk/run
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2010-03-13 02:52:19 UTC (rev 5304)
+++ CalendarServer/trunk/run	2010-03-15 17:52:04 UTC (rev 5305)
@@ -121,7 +121,7 @@
       echo "Missing config file: ${config}";
       echo "You might want to start by copying the test configuration:";
       echo "";
-      echo "  cp conf/${DAVD}davd-test.plist conf/caldavd-dev.plist";
+      echo "  cp conf/${DAVD}davd-test.plist conf/${DAVD}davd-dev.plist";
       echo "";
       exit 1;
     fi;

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2010-03-13 02:52:19 UTC (rev 5304)
+++ CalendarServer/trunk/support/build.sh	2010-03-15 17:52:04 UTC (rev 5305)
@@ -63,7 +63,7 @@
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.
   conditional_set wd "$(pwd)";
-  conditional_set config "${wd}/conf/caldavd-dev.plist";
+  conditional_set config "${wd}/conf/${DAVD}davd-dev.plist";
   conditional_set caldav "${wd}";
 
   if [ -z "${CALENDARSERVER_CACHE_DEPS-}" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100315/b8061774/attachment.html>