svn commit: r903357 - /subversion/trunk/tools/dist/dist.sh

[hw...@apache.org]

Author: hwright
Date: Tue Jan 26 18:40:00 2010
New Revision: 903357

URL: http://svn.apache.org/viewvc?rev=903357&view=rev
Log:
* tools/dist/dist.sh:
  Shuffle the Python detection snippet to a point where we can find the
  Python detection script.

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=903357&r1=903356&r2=903357&view=diff
==============================================================================
--- subversion/trunk/tools/dist/dist.sh (original)
+++ subversion/trunk/tools/dist/dist.sh Tue Jan 26 18:40:00 2010
@@ -184,16 +184,6 @@
   exit 1
 fi
 
-# Check for a recent enough Python
-PYTHON="`./build/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"
-  echo "PATH, set the environment variable PYTHON to the full path"
-  echo "to the Python executable, and re-run dist.sh"
-  exit 1
-fi
-
 # Default to 'wget', but allow 'curl' to be used if available.
 HTTP_FETCH=wget
 HTTP_FETCH_OUTPUT="-O"
@@ -214,6 +204,16 @@
 DISTPATH="$DIST_SANDBOX/$DISTNAME"
 DEPSPATH="$DIST_SANDBOX/deps/$DISTNAME"
 
+# Check for a recent enough Python
+PYTHON="`$DISTPATH/build/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"
+  echo "PATH, set the environment variable PYTHON to the full path"
+  echo "to the Python executable, and re-run dist.sh"
+  exit 1
+fi
+
 echo "Distribution will be named: $DISTNAME"
 echo "     constructed from path: /$REPOS_PATH"
 echo " constructed from revision: $REVISION"