You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David James <ja...@gmail.com> on 2005/08/27 18:12:09 UTC
Re: svn commit: r15941 - trunk/build
On 8/27/05, jerenkrantz@tigris.org <je...@tigris.org> wrote:
> Log:
> * build/find_python.sh: Work on Solaris's /bin/sh by skipping over blank
> environment variables.
I've tested this on Linux and it works great. This looks like an
important fix for Solaris. Thanks Justin!
> Modified: trunk/build/find_python.sh
> Url: http://svn.collab.net/viewcvs/svn/trunk/build/find_python.sh?rev=15941&p1=trunk/build/find_python.sh&p2=trunk/build/find_python.sh&r1=15940&r2=15941
> ==============================================================================
> --- trunk/build/find_python.sh (original)
> +++ trunk/build/find_python.sh Sat Aug 27 12:59:18 2005
> @@ -6,10 +6,12 @@
> VERSION=${1:-0x2000000}
>
> for pypath in "$PYTHON" "$PYTHON2" python python2; do
> - DETECT_PYTHON="import sys;sys.exit((sys.hexversion < $VERSION) and 1 or 0)"
> - if "$pypath" -c "$DETECT_PYTHON" >/dev/null 2>/dev/null; then
> - echo $pypath
> - exit 0
> + if [ "x$pypath" != "x" ]; then
> + DETECT_PYTHON="import sys;sys.exit((sys.hexversion < $VERSION) and 1 or 0)"
> + if "$pypath" -c "$DETECT_PYTHON" >/dev/null 2>/dev/null; then
> + echo $pypath
> + exit 0
> + fi
> fi
> done
> exit 1
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r15941 - trunk/build
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Sat, Aug 27, 2005 at 02:12:09PM -0400, David James wrote:
> On 8/27/05, jerenkrantz@tigris.org <je...@tigris.org> wrote:
> > Log:
> > * build/find_python.sh: Work on Solaris's /bin/sh by skipping over blank
> > environment variables.
> I've tested this on Linux and it works great. This looks like an
> important fix for Solaris. Thanks Justin!
Yes, the Solaris /bin/sh is rather picky. -- justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org