[CalendarServer-changes] [753] CalendarServer/trunk/run

[source_changes at macosforge.org]

Revision: 753
          http://trac.macosforge.org/projects/calendarserver/changeset/753
Author:   wsanchez at apple.com
Date:     2006-12-07 16:03:35 -0800 (Thu, 07 Dec 2006)

Log Message:
-----------
Put user's PYTHONPATH at end of PYTHONPATH for server

Modified Paths:
--------------
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2006-12-07 23:58:19 UTC (rev 752)
+++ CalendarServer/trunk/run	2006-12-08 00:03:35 UTC (rev 753)
@@ -136,7 +136,11 @@
   config="${wd}/conf/caldavd-dev.plist";
 fi;
 
-export PYTHONPATH="${caldav}";
+if [ -z "${PYTHONPATH:-}" ]; then
+  user_python_path="";
+else
+  user_python_path=":${PYTHONPATH}";
+fi;
 
        py_platform="$("${python}" -c "from distutils.util import get_platform; print get_platform()")";
         py_version="$(py_version "${python}")";
@@ -152,6 +156,8 @@
   svn_uri_base="http://svn.macosforge.org/repository/calendarserver";
 fi;
 
+export PYTHONPATH="${caldav}";
+
 ##
 # Download and set up dependancies
 ##
@@ -544,4 +550,6 @@
 # Run the server
 ##
 
+export PYTHONPATH="${PYTHONPATH}${user_python_path}";
+
 run;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061207/067e6ac5/attachment.html