From 7c6a4a0da7333db9777b60d591903859a6db5552 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 09:47:04 -0600
Subject: [PATCH] debugging

---
 bootstrap-salt.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 87ee6cd..468fed6 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1238,6 +1238,7 @@ __gather_linux_system_info() {
         esac
         DISTRO_NAME=$n
         DISTRO_VERSION=$v
+        echodebug "Linux distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
         break
     done
 }
@@ -1250,6 +1251,7 @@ __gather_linux_system_info() {
 __gather_osx_system_info() {
     DISTRO_NAME="MacOSX"
     DISTRO_VERSION=$(sw_vers -productVersion)
+    echodebug "MacOS distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
 }
 
 
@@ -2742,6 +2744,13 @@ EOM
 
     echoinfo "Installing Built Salt Wheel"
     ${_pip_cmd} uninstall --yes ${_USE_BREAK_SYSTEM_PACKAGES} salt 2>/dev/null || true
+
+    if [ "${DISTRO_NAME}"  = "Arch Linux" ]; then
+        _arch_dep="cryptography==42.0.0"
+        echodebug "Running '${_pip_cmd} --force-reinstall --break-system-packages ${_arch_dep}'"
+        ${_pip_cmd} --force-reinstall --break-system-packages "${_arch_dep}"
+    fi
+
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} /tmp/git/deps/salt*.whl'"
 
     ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
@@ -5734,10 +5743,6 @@ install_arch_linux_git_deps() {
         CONFIG_SALT_FUNC="config_salt"
     fi
 
-    _arch_dep="cryptography==42.0.0"
-    echodebug "Running '${_PY_EXE} -m pip install --break-system-packages --upgrade ${_arch_dep}'"
-    ${_PY_EXE} -m pip install --upgrade "${_arch_dep}"
-
     return 0
 }