traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.5 for issue #26664

This commit is contained in:
Brett Cannon 2016-06-30 11:43:19 -07:00
parent ee047e589d 660c8fc997
commit 16cd909daa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/venv/scripts/posix/activate.fish
View File

@ -55,8 +55,8 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
# with the original prompt function renamed, we can override with our own.
function fish_prompt
# Prompt override?
if test -n "$__VENV_PROMPT__"
printf "%s%s%s" "$__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
if test -n "__VENV_PROMPT__"
printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
return
end
# ...Otherwise, prepend env