From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 2 Nov 2011 18:18:14 +0000 (+0000)
Subject: python: Correctly check for Python major/minor.
X-Git-Tag: 1.15.2~9
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=646142f5136da9cfe2b908703a822c53350f70e9;p=libguestfs.git

python: Correctly check for Python major/minor.

The manual for sys.version warns that you should not parse the string,
which we were doing.  It would have failed on python "2.10" or
similar.

Do it correctly using the sys.version_info struct instead.
---

diff --git a/configure.ac b/configure.ac
index 7a19e33..259e093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -713,7 +713,9 @@ AS_IF([test "x$enable_python" != "xno"],
 	    AC_MSG_RESULT([$PYTHON_PREFIX])
 
 	    AC_MSG_CHECKING([Python version])
-            PYTHON_VERSION=`$PYTHON -c "import sys; print (sys.version[[0:3]])"`
+            PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info.major)"`
+            PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info.minor)"`
+            PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
 	    AC_MSG_RESULT([$PYTHON_VERSION])
 
             AC_MSG_CHECKING([for Python include path])