svn rev #23812: trunk/src/

ghudson@MIT.EDU ghudson at MIT.EDU
Wed Mar 17 15:11:09 EDT 2010


http://src.mit.edu/fisheye/changelog/krb5/?cs=23812
Commit By: ghudson
Log Message:
Add a version check to the Python test, so that we don't try to run
k5test in Python 2.3 or below.



Changed Files:
U   trunk/src/configure.in
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in	2010-03-17 06:00:56 UTC (rev 23811)
+++ trunk/src/configure.in	2010-03-17 19:11:09 UTC (rev 23812)
@@ -928,10 +928,19 @@
 fi
 AC_SUBST(HAVE_RUNTEST)
 
-# for Python tests
+# For Python tests.
 AC_CHECK_PROG(PYTHON,python,python)
 if test x"$PYTHON" != x; then
-	HAVE_PYTHON=yes
+	# k5test.py requires python 2.4 (for the subprocess module).
+	pyversion=$(python --version 2>&1 | awk '{print $2}')
+	case $pyversion in
+	1.*|2.0.*|2.1.*|2.2.*|2.3.*)
+		HAVE_PYTHON=no
+		;;
+	*)
+		HAVE_PYTHON=yes
+		;;
+	esac
 else
 	HAVE_PYTHON=no
 fi




More information about the cvs-krb5 mailing list