summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-06-30 18:41:55 (GMT)
committerBrett Cannon <brett@python.org>2016-06-30 18:41:55 (GMT)
commit660c8fc997f34b7474c23a993105a37b7277554f (patch)
tree21f76728d5d9497df00f858d57c9bf4b89956a75 /Lib
parent15287f8bcccdaeb7ae4a58373547c77137966bc1 (diff)
downloadcpython-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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/venv/scripts/posix/activate.fish4
1 files changed, 2 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