[Python-checkins] cpython (merge 3.5 -> default): Fixes #26348: Merged fix from 3.5.

[vinay.sajip]

https://hg.python.org/cpython/rev/0f1ac94d2f98
changeset:   100235:0f1ac94d2f98
parent:      100233:f4d7de7d18c0
parent:      100234:cfc66e37eb8e
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sat Feb 13 16:27:25 2016 +0000
summary:
  Fixes #26348: Merged fix from 3.5.

files:
  Lib/venv/scripts/posix/activate.fish |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish
--- a/Lib/venv/scripts/posix/activate.fish
+++ b/Lib/venv/scripts/posix/activate.fish
@@ -55,8 +55,8 @@
     # 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

-- 
Repository URL: https://hg.python.org/cpython