Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: pin tox version on rtd-verify.sh
[releng/global-jjb.git]
/
jenkins-init-scripts
/
lf-env.sh
diff --git
a/jenkins-init-scripts/lf-env.sh
b/jenkins-init-scripts/lf-env.sh
index
91aa80c
..
f80dc79
100644
(file)
--- a/
jenkins-init-scripts/lf-env.sh
+++ b/
jenkins-init-scripts/lf-env.sh
@@
-245,13
+245,13
@@
lf-activate-venv () {
"$lf_venv/bin/pip" install --upgrade --quiet pip virtualenv || return 1
if [[ -z $pkg_list ]]; then
echo "${FUNCNAME[0]}(): WARNING: No packages to install"
"$lf_venv/bin/pip" install --upgrade --quiet pip virtualenv || return 1
if [[ -z $pkg_list ]]; then
echo "${FUNCNAME[0]}(): WARNING: No packages to install"
- return 0
+ else
+ echo "${FUNCNAME[0]}(): INFO: Installing: $pkg_list"
+ # $pkg_list is expected to be unquoted
+ # shellcheck disable=SC2086
+ "$lf_venv/bin/pip" install --upgrade --quiet --upgrade-strategy eager \
+ $pkg_list || return 1
fi
fi
- echo "${FUNCNAME[0]}(): INFO: Installing: $pkg_list"
- # $pkg_list is expected to be unquoted
- # shellcheck disable=SC2086
- "$lf_venv/bin/pip" install --upgrade --quiet --upgrade-strategy eager \
- $pkg_list || return 1
;;
*)
lf-echo-stderr "${FUNCNAME[0]}(): ERROR: No support for: $python"
;;
*)
lf-echo-stderr "${FUNCNAME[0]}(): ERROR: No support for: $python"