X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-init-scripts%2Flf-env.sh;h=91aa80c62f9d60b8d6ce5ef6f4aeb951c88da358;hb=74a4defcfba1d8d39bf1db6889909afcc1ab1a83;hp=bd9f7807890a2323164762b0afa5bb35b510af57;hpb=d233be84b81a56b80356ac0f20a1658c9a93a5dd;p=releng%2Fglobal-jjb.git diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh index bd9f7807..91aa80c6 100644 --- a/jenkins-init-scripts/lf-env.sh +++ b/jenkins-init-scripts/lf-env.sh @@ -227,12 +227,16 @@ lf-activate-venv () { # 1. --venv-file as lf_venv # 2. default: "/tmp/.os_lf_venv" # - Create new venv when 1. and 2. is absent - if [ -f "$venv_file" ]; then + if [[ -f "$venv_file" ]]; then lf_venv=$(cat "$venv_file") echo "${FUNCNAME[0]}(): INFO: Reuse venv:$lf_venv from" \ "file:$venv_file" - elif [ ! -f "$venv_file" ]; then - $python -m venv "$install_args" "$lf_venv" || return 1 + elif [[ ! -f "$venv_file" ]]; then + if [[ -n "$install_args" ]]; then + $python -m venv "$install_args" "$lf_venv" || return 1 + else + $python -m venv "$lf_venv" || return 1 + fi echo "${FUNCNAME[0]}(): INFO: Creating $python venv at $lf_venv" echo "$lf_venv" > "$venv_file" echo "${FUNCNAME[0]}(): INFO: Save venv in file: $venv_file"