m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-12 13:33:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore failure of pyenv activate

Browse Source 
When the current pyenv environment is not a virtualenv, this line
exits with a return code of 1. This is annoying for those of us
who report the last return code in our own PROMPT_COMMAND, so
ignore the output of `pyenv activate` if we're not currently using
a virtualenv.
This commit is contained in:
Josh Hagins
2015-03-18 22:13:56 -04:00
parent 32e5a73345
commit 5953ddaf64
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pyenv-virtualenv-init
View File

@@ -92,7 +92,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
end
else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
pyenv activate --no-error --verbose
pyenv activate --no-error --verbose; or true
end
end
end
@@ -128,7 +128,7 @@ if [[ "$shell" != "fish" ]]; then
fi
else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
pyenv activate --no-error --verbose
pyenv activate --no-error --verbose || true
fi
fi
};

6
test/init.bats
View File

@@ -47,7 +47,7 @@ _pyenv_virtualenv_hook() {
fi
else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
pyenv activate --no-error --verbose
pyenv activate --no-error --verbose || true
fi
fi
};
@@ -80,7 +80,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
end
else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
pyenv activate --no-error --verbose
pyenv activate --no-error --verbose; or true
end
end
end
@@ -109,7 +109,7 @@ _pyenv_virtualenv_hook() {
fi
else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
pyenv activate --no-error --verbose
pyenv activate --no-error --verbose || true
fi
fi
};