From 8098495e1cc6ad5b653dd8897e43f1900f40b58a Mon Sep 17 00:00:00 2001 From: Baptiste Darthenay Date: Tue, 27 Nov 2018 17:19:53 +0100 Subject: [PATCH] bpo-35328: Set VIRTUAL_ENV_PROMPT at venv activation --- Lib/venv/scripts/common/activate | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate index fff0765af53b82..62f3ca1e069646 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -28,6 +28,7 @@ deactivate () { fi unset VIRTUAL_ENV + unset VIRTUAL_ENV_PROMPT if [ ! "$1" = "nondestructive" ] ; then # Self destruct! unset -f deactivate @@ -55,8 +56,10 @@ fi if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then _OLD_VIRTUAL_PS1="${PS1:-}" if [ "x__VENV_PROMPT__" != x ] ; then - PS1="__VENV_PROMPT__${PS1:-}" + VIRTUAL_ENV_PROMPT="__VENV_PROMPT__" + PS1="__VENV_PROMPT__${PS1:-}" else + VIRTUAL_ENV_PROMPT="`basename \"$VIRTUAL_ENV\"`" if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then # special case for Aspen magic directories # see http://www.zetadev.com/software/aspen/ @@ -65,6 +68,7 @@ if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1" fi fi + export VIRTUAL_ENV_PROMPT export PS1 fi