diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-01 18:46:52 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-01 18:46:52 -0500 |
commit | 15a0f3bf77cf60ae29484f0c0a26c679e4c688fd (patch) | |
tree | 40a5f82d8783ffa1435cf60084b0d6ccea646468 /configure | |
parent | 174210fe70d34a1ac70b98c1e4412934cbee2061 (diff) | |
parent | e120d449e1b39ec508c297b963ce452628dd37c3 (diff) | |
download | hqemu-15a0f3bf77cf60ae29484f0c0a26c679e4c688fd.zip hqemu-15a0f3bf77cf60ae29484f0c0a26c679e4c688fd.tar.gz |
Merge remote-tracking branch 'stefanha/tracing' into staging
* stefanha/tracing:
configure: check for supported Python 2.x versions
tracetool: avoid pkgutil.iter_modules() Python 2.7 function
tracetool: avoid str.rpartition() Python 2.5 function
tracetool: use Python 2.4-compatible __import__() arguments
tracetool: use Python 2.4-compatible exception handling syntax
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1239,9 +1239,10 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! "$python" -c 'import sys; sys.exit(sys.version_info[0] >= 3)'; then - echo "Python 2 required but '$python' is version 3 or better." - echo "Use --python=/path/to/python to specify a Python 2." +if ! "$python" -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_info >= (3,))'; then + echo "Cannot use '$python', Python 2.4 or later is required." + echo "Note that Python 3 or later is not yet supported." + echo "Use --python=/path/to/python to specify a supported Python." exit 1 fi |