Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 512fc2d

Browse files
committed
Revert "Make configure prefer python3 to plain python."
This reverts commit f201da3. The buildfarm is not ready for python3, evidently, so we'll give the owners some more time to get set up. Discussion: https://postgr.es/m/2872c9a0-4b0a-1354-d5f6-94d6f85ba354@enterprisedb.com
1 parent 4fdbf9a commit 512fc2d

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

config/python.m4

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
# Look for Python and set the output variable 'PYTHON' if found,
1010
# fail otherwise.
1111
#
12-
# Since we are transitioning to supporting only Python 3.x,
13-
# prefer python3 to plain python. If the latter exists at all,
14-
# it very possibly points to python2, which we don't want to
15-
# select unless it's the only choice.
12+
# As the Python 3 transition happens and PEP 394 isn't updated, we
13+
# need to cater to systems that don't have unversioned "python" by
14+
# default. Some systems ship with "python3" by default and perhaps
15+
# have "python" in an optional package. Some systems only have
16+
# "python2" and "python3", in which case it's reasonable to prefer the
17+
# newer version.
1618
AC_DEFUN([PGAC_PATH_PYTHON],
17-
[PGAC_PATH_PROGS(PYTHON, [python3 python python2])
19+
[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
1820
AC_ARG_VAR(PYTHON, [Python program])dnl
1921
if test x"$PYTHON" = x""; then
2022
AC_MSG_ERROR([Python not found])

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -10279,7 +10279,7 @@ fi
1027910279

1028010280
if test "$with_python" = yes; then
1028110281
if test -z "$PYTHON"; then
10282-
for ac_prog in python3 python python2
10282+
for ac_prog in python python3 python2
1028310283
do
1028410284
# Extract the first word of "$ac_prog", so it can be a program name with args.
1028510285
set dummy $ac_prog; ac_word=$2

doc/src/sgml/installation.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ build-postgresql:
18751875
language becomes available. See
18761876
<xref linkend="plpython-python23"/>
18771877
for more information. If this is not set, the following are probed
1878-
in this order: <literal>python3 python python2</literal>.
1878+
in this order: <literal>python python3 python2</literal>.
18791879
</para>
18801880
</listitem>
18811881
</varlistentry>

0 commit comments

Comments
 (0)