Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename to py39-salt, Python 3.9 is default version on FreeBSD #1842

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Rename to py39-salt, Python 3.9 is default version on FreeBSD #1842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5983,15 +5983,15 @@ install_freebsd_git_deps() {

if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then

SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py38-salt)
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py39-salt)
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1

/usr/local/sbin/pkg install -y py38-requests || return 1
/usr/local/sbin/pkg install -y py38-tornado4 || return 1
/usr/local/sbin/pkg install -y py39-requests || return 1
/usr/local/sbin/pkg install -y py39-tornado4 || return 1

else
/usr/local/sbin/pkg install -y python py38-pip py38-setuptools libzmq4 libunwind || return 1
/usr/local/sbin/pkg install -y python py39-pip py39-setuptools libzmq4 libunwind || return 1
fi

echodebug "Adapting paths to FreeBSD"
Expand Down Expand Up @@ -6037,7 +6037,7 @@ install_freebsd_stable() {
# installing latest version of salt from FreeBSD CURRENT ports repo
#
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y py38-salt || return 1
/usr/local/sbin/pkg install -y py39-salt || return 1

return 0
}
Expand Down