Skip to content

Commit

Permalink
Simplify and clean-up exit 1 code
Browse files Browse the repository at this point in the history
  • Loading branch information
th0ma7 committed Dec 3, 2023
1 parent ed80edc commit 9df4e29
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions mk/spksrc.service.installer.functions
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ install_python_virtualenv ()
echo "WARNING: No pip found, using default online version"
fi

if ! python3 -m pip install --upgrade ${PIP}; then
echo "Error: Python upgrade failed" 1>&2
exit 1
fi
python3 -m pip install --upgrade ${PIP} \
|| echo "ERROR: Python upgrade failed" 1>&2

if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
set_unix_permissions ${SYNOPKG_PKGDEST}/env
Expand All @@ -112,7 +110,7 @@ install_python_wheels ()
--cache-dir ${cachedir} \
--find-links ${wheelhouse} \
--requirement ${requirements} \
|| { echo "Error: Python package installation failed" 1>&2; exit 1; }
|| echo "ERROR: Python package installation failed" 1>&2
fi

if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
Expand Down

0 comments on commit 9df4e29

Please sign in to comment.