m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-10 20:43:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow manual activation of virtualenvs inside $(pyenv-root)/versions (#115)

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-16 02:29:46 +00:00
parent de1deb1e81
commit caa5832b8a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-sh-activate
View File

@@ -67,7 +67,6 @@ venv="${versions}"
# exit as success if some virtualenv outside from pyenv is already activated # exit as success if some virtualenv outside from pyenv is already activated
if [ -n "${VIRTUAL_ENV}" ]; then if [ -n "${VIRTUAL_ENV}" ]; then
if [[ "${VIRTUAL_ENV}" != "$(pyenv-root)/"* ]]; then
if [ -z "${FORCE}" ]; then if [ -z "${FORCE}" ]; then
if [ -z "${QUIET}" ]; then if [ -z "${QUIET}" ]; then
echo "pyenv-virtualenv: virtualenv \`${VIRTUAL_ENV}' is already activated" 1>&2 echo "pyenv-virtualenv: virtualenv \`${VIRTUAL_ENV}' is already activated" 1>&2
@@ -76,7 +75,6 @@ if [ -n "${VIRTUAL_ENV}" ]; then
exit 0 exit 0
fi fi
fi fi
fi
if ! pyenv-virtualenv-prefix "${venv}" 1>/dev/null 2>&1; then if ! pyenv-virtualenv-prefix "${venv}" 1>/dev/null 2>&1; then
if [ -z "$QUIET" ]; then if [ -z "$QUIET" ]; then