diff -r c0a9fb3e19b9 -r 61f5895a4b24 Lib/venv/scripts/nt/Activate.ps1 --- a/Lib/venv/scripts/nt/Activate.ps1 Mon Jan 23 12:29:47 2017 +0200 +++ b/Lib/venv/scripts/nt/Activate.ps1 Mon Jan 23 16:05:38 2017 +0000 @@ -26,16 +26,18 @@ } deactivate -nondestructive - + $env:VIRTUAL_ENV="__VENV_DIR__" -# Set the prompt to include the env name -# Make sure _OLD_VIRTUAL_PROMPT is global -function global:_OLD_VIRTUAL_PROMPT {""} -copy-item function:prompt function:_OLD_VIRTUAL_PROMPT -function global:prompt { - Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__' - _OLD_VIRTUAL_PROMPT +if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) { + # Set the prompt to include the env name + # Make sure _OLD_VIRTUAL_PROMPT is global + function global:_OLD_VIRTUAL_PROMPT {""} + copy-item function:prompt function:_OLD_VIRTUAL_PROMPT + function global:prompt { + Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__' + _OLD_VIRTUAL_PROMPT + } } # Clear PYTHONHOME