diff options
| author | Brett Cannon <brett@python.org> | 2016-06-30 18:41:55 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2016-06-30 18:41:55 (GMT) |
| commit | 660c8fc997f34b7474c23a993105a37b7277554f (patch) | |
| tree | 21f76728d5d9497df00f858d57c9bf4b89956a75 | |
| parent | 15287f8bcccdaeb7ae4a58373547c77137966bc1 (diff) | |
| download | cpython-660c8fc997f34b7474c23a993105a37b7277554f.zip cpython-660c8fc997f34b7474c23a993105a37b7277554f.tar.gz cpython-660c8fc997f34b7474c23a993105a37b7277554f.tar.bz2 | |
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.
| -rw-r--r-- | Lib/venv/scripts/posix/activate.fish | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish index fb7f5c0..45391aa 100644 --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -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 @@ -13,6 +13,8 @@ Core and Builtins Library ------- +- Issue #26664: Fix activate.fish by removing mis-use of ``$``. + - Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong mode no longer break tracing, trace_vinfo() now always returns a list of pairs of strings, tracing in the "u" mode now works. |