mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Don't install wheel, it's already there
This commit is contained in:
parent
9e22256648
commit
61c5b65630
1 changed files with 4 additions and 9 deletions
|
@ -90,6 +90,7 @@ done
|
|||
#-------------------------------------------------------------------------------
|
||||
printf "=%.0s" {1..80}; printf "\n"
|
||||
echo "Install Salt into Build Environment"
|
||||
echo "Python Version: $PYTHON_DOT_VER"
|
||||
printf -- "-%.0s" {1..80}; printf "\n"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -125,15 +126,6 @@ fi
|
|||
#-------------------------------------------------------------------------------
|
||||
# Install Requirements into the Python Environment
|
||||
#-------------------------------------------------------------------------------
|
||||
_msg "Installing wheel"
|
||||
$PIP_BIN install "wheel" > /dev/null 2>&1
|
||||
TEST_DIR="$SCRIPT_DIR/build/opt/salt/lib/python3.*/site-packages/wheel*"
|
||||
if compgen -G "$TEST_DIR" > /dev/null; then
|
||||
_success
|
||||
else
|
||||
_failure
|
||||
fi
|
||||
|
||||
_msg "Installing Salt requirements"
|
||||
$PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
|
||||
if [ -f "$BUILD_DIR/bin/distro" ]; then
|
||||
|
@ -154,6 +146,9 @@ else
|
|||
_failure
|
||||
fi
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Script Complete
|
||||
#-------------------------------------------------------------------------------
|
||||
printf -- "-%.0s" {1..80}; printf "\n"
|
||||
echo "Install Salt into Build Environment Completed"
|
||||
printf "=%.0s" {1..80}; printf "\n"
|
||||
|
|
Loading…
Add table
Reference in a new issue