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

Issue #26665: Remove mis-use of ``$`` in activate.fish. 

This is a revertion of cfc66e37eb8e.

Thanks to 鄭景文 for the bug report. Thanks to Tin Tvrtković, Xiang
Zhang, and Dan McCombs for diagnosing the issue.
This commit is contained in:
Brett Cannon 2016-06-30 11:41:55 -07:00
parent 15287f8bcc
commit 660c8fc997
2 changed files with 4 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. # with the original prompt function renamed, we can override with our own.
function fish_prompt function fish_prompt
# Prompt override? # Prompt override?
if test -n "$__VENV_PROMPT__" if test -n "__VENV_PROMPT__"
printf "%s%s%s" "$__VENV_PROMPT__" (set_color normal) (_old_fish_prompt) printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
return return
end end
# ...Otherwise, prepend env # ...Otherwise, prepend env

2
Misc/NEWS
View File

@ -13,6 +13,8 @@ Core and Builtins
Library Library
------- -------
- Issue #26664: Fix activate.fish by removing mis-use of ``$``.
- Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong - Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong
mode no longer break tracing, trace_vinfo() now always returns a list of mode no longer break tracing, trace_vinfo() now always returns a list of
pairs of strings, tracing in the "u" mode now works. pairs of strings, tracing in the "u" mode now works.