Skip to content

Commit

Permalink
Merge pull request saltstack#1482 from bryceml/dont_hardfail_R_on_centos
Browse files Browse the repository at this point in the history
don't hardfail -R with -x python3 on centos
  • Loading branch information
dmurphy18 authored Jun 18, 2020
2 parents 24b11bb + f243589 commit 6bd3783
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions bootstrap-salt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4144,10 +4144,9 @@ install_centos_stable_deps() {
fi

if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
echoerror "Detected -r or -R option while installing Salt packages for Python 3."
echoerror "Python 3 packages for Salt require the EPEL repository to be installed."
echoerror "The -r and -R options are incompatible with -x and Python 3 bootstrap installs."
return 1
echowarn "Detected -r or -R option while installing Salt packages for Python 3."
echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed."
echowarn "Installing the EPEL repository automatically is disabled when using the -r or -R options."
fi

if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then
Expand Down

0 comments on commit 6bd3783

Please sign in to comment.