[CalendarServer-changes] [7369] CalendarServer/branches/users/glyph/misc-portability-fixes/support/ py.sh

[source_changes at macosforge.org]

Revision: 7369
          http://trac.macosforge.org/projects/calendarserver/changeset/7369
Author:   glyph at apple.com
Date:     2011-04-27 11:44:45 -0700 (Wed, 27 Apr 2011)
Log Message:
-----------
Postgres apparently requires an absolute path.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/misc-portability-fixes/support/py.sh

Modified: CalendarServer/branches/users/glyph/misc-portability-fixes/support/py.sh
===================================================================
--- CalendarServer/branches/users/glyph/misc-portability-fixes/support/py.sh	2011-04-27 18:44:38 UTC (rev 7368)
+++ CalendarServer/branches/users/glyph/misc-portability-fixes/support/py.sh	2011-04-27 18:44:45 UTC (rev 7369)
@@ -170,13 +170,13 @@
   # like virtualenv.
   python="$(detect_python_version)";
 
-  # Set the $PYTHON environment variable, a standard-ish mechanism used by
-  # certain non-distutils things that need to find the "right" python.  For
-  # instance, the part of the PostgreSQL build process which builds pl_python.
-  # Note that detect_python_version, above, already honors $PYTHON, so if this
-  # is already set it won't be stomped on, it will just be re-set to the same
-  # value.
-  export PYTHON="${python}";
+  # Set the $PYTHON environment variable to an absolute path pointing at the
+  # appropriate python executable, a standard-ish mechanism used by certain
+  # non-distutils things that need to find the "right" python.  For instance,
+  # the part of the PostgreSQL build process which builds pl_python.  Note that
+  # detect_python_version, above, already honors $PYTHON, so if this is already
+  # set it won't be stomped on, it will just be re-set to the same value.
+  export PYTHON="$(type -p ${python})";
 
   if [ -z "${python:-}" ]; then
     echo "No suitable python found. Python 2.5 is required.";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110427/f7c26658/attachment-0001.html>