diff options
| author | Brett Cannon <brett@python.org> | 2016-06-30 18:43:19 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2016-06-30 18:43:19 (GMT) |
| commit | 16cd909daad3056cbd8b0dd7889718185c27c11f (patch) | |
| tree | bd30ad9f6fe1ab190f4e213ab49fdae9c60fa56e /Lib/venv | |
| parent | ee047e589d0121e2374111b1b4744c5b0d5c42bf (diff) | |
| parent | 660c8fc997f34b7474c23a993105a37b7277554f (diff) | |
| download | cpython-16cd909daad3056cbd8b0dd7889718185c27c11f.zip cpython-16cd909daad3056cbd8b0dd7889718185c27c11f.tar.gz cpython-16cd909daad3056cbd8b0dd7889718185c27c11f.tar.bz2 | |
Merge from 3.5 for issue #26664
Diffstat (limited to 'Lib/venv')
| -rw-r--r-- | 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 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 |