| Message ID | 20180116134217.8725-11-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support building with py2 or py3 | expand |
On 01/16/2018 07:42 AM, Daniel P. Berrange wrote: > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > configure | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com> Presumably, you tested with this patch first in the series to come up with patches 1-9 ;) > diff --git a/configure b/configure > index b272a0336b..60b99f45f6 100755 > --- a/configure > +++ b/configure > @@ -1598,9 +1598,8 @@ 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 < (2,6) or sys.version_info >= (3,))'; then > - error_exit "Cannot use '$python', Python 2.6 or later is required." \ > - "Note that Python 3 or later is not yet supported." \ > +if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then > + error_exit "Cannot use '$python', Python 2 >= 2.6 or Python 3 is required." \ > "Use --python=/path/to/python to specify a supported Python." > fi > >
diff --git a/configure b/configure index b272a0336b..60b99f45f6 100755 --- a/configure +++ b/configure @@ -1598,9 +1598,8 @@ 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 < (2,6) or sys.version_info >= (3,))'; then - error_exit "Cannot use '$python', Python 2.6 or later is required." \ - "Note that Python 3 or later is not yet supported." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then + error_exit "Cannot use '$python', Python 2 >= 2.6 or Python 3 is required." \ "Use --python=/path/to/python to specify a supported Python." fi
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)