File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change 2626# ======================================================================================================================
2727set -o nounset # Treat unset variables as an error
2828
29- __ScriptVersion=" 2025.09.03 "
29+ __ScriptVersion=" 2025.11.24 "
3030__ScriptName=" bootstrap-salt.sh"
3131
3232__ScriptFullName=" $0 "
@@ -2821,11 +2821,11 @@ __install_salt_from_repo() {
28212821
28222822 echodebug " Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} ${_TMP_DIR} /git/deps/salt*.whl'"
28232823
2824- echodebug " Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} ${_TMP_DIR} /git/deps/salt*.whl"
2824+ echodebug " Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --config-settings=-- global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} ${_TMP_DIR} /git/deps/salt*.whl"
28252825
28262826 ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
28272827 ${_PIP_INSTALL_ARGS} \
2828- --global-option=" --salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} " \
2828+ --config-settings= " -- global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} " \
28292829 ${_TMP_DIR} /git/deps/salt* .whl || return 1
28302830
28312831 echoinfo " Checking if Salt can be imported using ${_py_exe} "
You can’t perform that action at this time.
0 commit comments