saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 02:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1482 from bryceml/dont_hardfail_R_on_centos

Browse source 
don't hardfail -R with -x python3 on centos
This commit is contained in:
David Murphy 2020-06-18 14:10:28 -06:00 • committed by GitHub
commit 6bd3783a72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bootstrap-salt.sh
View file

@ -4144,10 +4144,9 @@ install_centos_stable_deps() {
fi fi
if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then 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." echowarn "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." echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed."
echoerror "The -r and -R options are incompatible with -x and Python 3 bootstrap installs." echowarn "Installing the EPEL repository automatically is disabled when using the -r or -R options."
return 1
fi fi
if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then