From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 3 Nov 2011 09:48:45 +0000 (+0000)
Subject: python: Use sys.version_info[0] instead of sys.version_info.major.
X-Git-Tag: 1.14.2~13
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=70a98f99dbd989d246b071f12ea400566f20508c;p=libguestfs.git

python: Use sys.version_info[0] instead of sys.version_info.major.

The major/minor fields only exist in Python >= 2.7.  This works for at
least Python 2.5 and 2.6.

Thanks to Hilko Bengen.

This updates commit 646142f5136da9cfe2b908703a822c53350f70e9.
(cherry picked from commit 31e5539a14f78d8815d0d930e91023a65b5395e7)
---

diff --git a/configure.ac b/configure.ac
index 81bcbb5..eca45e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -713,8 +713,8 @@ AS_IF([test "x$enable_python" != "xno"],
 	    AC_MSG_RESULT([$PYTHON_PREFIX])
 
 	    AC_MSG_CHECKING([Python version])
-            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_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
+            PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
             PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
 	    AC_MSG_RESULT([$PYTHON_VERSION])