[CalendarServer-changes] [7343] CalendarServer/branches/users/glyph/oracle-nulls

[source_changes at macosforge.org]

Revision: 7343
          http://trac.macosforge.org/projects/calendarserver/changeset/7343
Author:   glyph at apple.com
Date:     2011-04-21 09:52:34 -0700 (Thu, 21 Apr 2011)
Log Message:
-----------
use detected python version, and share dependency-initialization logic between shell and python.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/oracle-nulls/python
    CalendarServer/branches/users/glyph/oracle-nulls/support/shell.sh

Modified: CalendarServer/branches/users/glyph/oracle-nulls/python
===================================================================
--- CalendarServer/branches/users/glyph/oracle-nulls/python	2011-04-21 16:52:27 UTC (rev 7342)
+++ CalendarServer/branches/users/glyph/oracle-nulls/python	2011-04-21 16:52:34 UTC (rev 7343)
@@ -2,6 +2,7 @@
 
 wd="$(cd "$(dirname "$0")" && pwd)";
 
-export PYTHONPATH="$("${wd}/run" -p)";
+. "${wd}/support/shell.sh"
 
-exec python "$@";
+exec "${python}" "$@";
+

Modified: CalendarServer/branches/users/glyph/oracle-nulls/support/shell.sh
===================================================================
--- CalendarServer/branches/users/glyph/oracle-nulls/support/shell.sh	2011-04-21 16:52:27 UTC (rev 7342)
+++ CalendarServer/branches/users/glyph/oracle-nulls/support/shell.sh	2011-04-21 16:52:34 UTC (rev 7343)
@@ -21,7 +21,10 @@
 # set up by the CalendarServer run script and are not otherwise installed on
 # your system.
 
-wd="$(pwd)";
+if [ -z "${wd}" ]; then
+    wd="$(pwd)";
+fi;
+
 . ${wd}/support/build.sh;
 do_setup=false;
 do_get=false;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110421/7377418d/attachment.html>