IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-29 03:53:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an RPM build issue that could lead to a conflict with python3 at installation. Fixes #7013.

Browse Source
This commit is contained in:
Dave Page 2021-11-23 09:16:47 +00:00
parent b921a55c46
commit 849a1b1a89
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_3.rst
View File

@ -23,3 +23,4 @@ Bug fixes
| `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ - Fixed an issue where the user can't debug function with timestamp parameter. | `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ - Fixed an issue where the user can't debug function with timestamp parameter.
| `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ - Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined. | `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ - Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined.
| `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ - Ensure that Python 3.10 and the latest eventlet dependency should not break the application. | `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ - Ensure that Python 3.10 and the latest eventlet dependency should not break the application.
| `Issue #7013 <https://redmine.postgresql.org/issues/7013>`_ - Fix an RPM build issue that could lead to a conflict with python3 at installation.

4
pkg/linux/build-functions.sh
View File

@ -215,12 +215,14 @@ _copy_code() {
mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/" mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/"
cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/" cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/"
# Ensure our venv will use the correct Python interpretor, even if the # Ensure our venv will use the correct Python interpreter, even if the
# user has configured an alternative default. # user has configured an alternative default.
# DO THIS LAST! # DO THIS LAST!
cd "${SERVERROOT}/usr/${APP_NAME}/venv/bin" cd "${SERVERROOT}/usr/${APP_NAME}/venv/bin"
PYTHON_INTERPRETER=$(/usr/bin/python3 -c "import os, sys; print(os.path.realpath(sys.executable))") PYTHON_INTERPRETER=$(/usr/bin/python3 -c "import os, sys; print(os.path.realpath(sys.executable))")
PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor))")
rm python && ln -s python3 python rm python && ln -s python3 python
rm python${PYTHON_VERSION} && ln -s python3 python${PYTHON_VERSION}
rm python3 && ln -s "${PYTHON_INTERPRETER}" python3 rm python3 && ln -s "${PYTHON_INTERPRETER}" python3
} }