Fedora Py3 Tornado <5.0 workaround

This commit is contained in:
Ronald van Zantvoort 2018-08-09 14:38:07 +02:00
parent bfb7c79465
commit 65d134132c
No known key found for this signature in database
GPG key ID: D3DE53B7EFF75061

View file

@ -3506,7 +3506,15 @@ install_fedora_git_deps() {
__git_clone_and_checkout || return 1
__PACKAGES="python${PY_PKG_VER}-tornado python${PY_PKG_VER}-systemd"
__PACKAGES="python${PY_PKG_VER}-systemd"
if [ "${PY_PKG_VER}" -eq 3 -a "$DISTRO_MAJOR_VERSION" -ge 28 ]; then
__check_pip_allowed "You need to allow pip based installations (-P) for Tornado <5.0 in order to install Salt on Python 3"
grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" | while IFS=$'\n' read -r dep; do
"${_PY_EXE}" -m pip install "${dep}" || return 1
done
else
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado"
fi
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-libcloud python${PY_PKG_VER}-netaddr"