[CalendarServer-changes] [2702] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 2702
          http://trac.macosforge.org/projects/calendarserver/changeset/2702
Author:   wsanchez at apple.com
Date:     2008-07-15 10:01:01 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Extend PATH to find memcached

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2008-07-15 16:57:10 UTC (rev 2701)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2008-07-15 17:01:01 UTC (rev 2702)
@@ -487,7 +487,6 @@
     <integer>5</integer>
     <key>memcached</key>
     <string>memcached</string> <!-- Find in PATH -->
-    <!-- <string>../memcached-1.2.5/_root/bin/memcached</string> --> <!-- If memcached was build by run script -->
     <key>Options</key>
     <array>
       <!--<string>-vv</string>-->

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2008-07-15 16:57:10 UTC (rev 2701)
+++ CalendarServer/trunk/run	2008-07-15 17:01:01 UTC (rev 2702)
@@ -245,13 +245,15 @@
     if [ ! -d "${wd}/logs" ]; then
       mkdir "${wd}/logs";
     fi;
-    exec ${caldavd_wrapper_command}          \
-        "${caldav}/bin/caldavd" ${daemonize} \
-        -f "${config}"                       \
-        -T "${twisted}/bin/twistd"           \
-        -P "${plugin_name}"                  \
-        -t "${service_type}"                 \
-        ${reactor}                         \
+
+    PATH="${PATH}:${wd}/../memcached-1.2.5/_root/bin" \
+    exec ${caldavd_wrapper_command}                   \
+        "${caldav}/bin/caldavd" ${daemonize}          \
+        -f "${config}"                                \
+        -T "${twisted}/bin/twistd"                    \
+        -P "${plugin_name}"                           \
+        -t "${service_type}"                          \
+        ${reactor}                                    \
         ${profile};
     cd /;
   fi;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080715/447da44d/attachment.html