From 6367592fe3405d4b3518326670c5f76146a148fa Mon Sep 17 00:00:00 2001 From: Justin Findlay Date: Mon, 28 Mar 2016 10:57:29 -0600 Subject: [PATCH] get tornado from pip on a fedora git install --- bootstrap-salt.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7a267f8..506e735 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2935,7 +2935,15 @@ install_fedora_git_deps() { # We're on the develop branch, install whichever tornado is on the requirements file __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" if [ "${__REQUIRED_TORNADO}" != "" ]; then - $FEDORA_PACKAGE_MANAGER install -y python-tornado + __check_pip_allowed "You need to allow pip based installations (-P) in order to install tornado" + + # Install pip and pip dependencies + if ! __check_command_exists pip; then + $FEDORA_PACKAGE_MANAGER install -y python-setuptools python-pip gcc python-devel + fi + + pip install -U tornado + fi fi