You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/22 22:34:12 UTC
svn commit: r926352 - /subversion/trunk/tools/dist/dist.sh
Author: hwright
Date: Mon Mar 22 21:34:12 2010
New Revision: 926352
URL: http://svn.apache.org/viewvc?rev=926352&view=rev
Log:
* tools/dist/dist.sh:
Fix finding python when rolling the windows binaries.
Modified:
subversion/trunk/tools/dist/dist.sh
Modified: subversion/trunk/tools/dist/dist.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/dist.sh?rev=926352&r1=926351&r2=926352&view=diff
==============================================================================
--- subversion/trunk/tools/dist/dist.sh (original)
+++ subversion/trunk/tools/dist/dist.sh Mon Mar 22 21:34:12 2010
@@ -238,7 +238,12 @@ rm -rf "$DISTPATH/contrib"
rm -rf "$DISTPATH/packages"
# Check for a recent enough Python
-PYTHON="`$DISTPATH/build/find_python.sh`"
+# Instead of attempting to deal with various line ending issues, just export
+# the find_python script manually.
+${svn:-svn} export -q -r "$REVISION" \
+ "http://svn.apache.org/repos/asf/subversion/$REPOS_PATH/build/find_python.sh" \
+ --username none --password none "$DIST_SANDBOX/find_python.sh"
+PYTHON="`$DIST_SANDBOX/find_python.sh`"
if test -z "$PYTHON"; then
echo "Python 2.4 or later is required to run dist.sh"
echo "If you have a suitable Python installed, but not on the"