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

Merge pull request #68 from jawshooah/ignore-error-code

Browse Source 
Ignore failure of pyenv activate
This commit is contained in:
Yamashita, Yuu
2015-03-19 12:18:19 +09:00
parent 32e5a73345 5953ddaf64
commit bcb7abdf93
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 end
else else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ] if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
pyenv activate --no-error --verbose pyenv activate --no-error --verbose; or true
end end
end end
end end
@@ -128,7 +128,7 @@ if [[ "$shell" != "fish" ]]; then
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then 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
fi fi
}; };

6
test/init.bats
View File

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