Closes #29308: Merged fix from 3.6.

61fda05b · Vinay Sajip · f473fda0 · dbb5686e · 61fda05b
Commit 61fda05b authored Jan 27, 2017 by Vinay Sajip
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

Lib/venv/scripts/nt/Activate.ps1 Lib/venv/scripts/nt/Activate.ps1 +9 -7

No files found.
--- a/Lib/venv/scripts/nt/Activate.ps1
+++ b/Lib/venv/scripts/nt/Activate.ps1
@@ -29,13 +29,15 @@ deactivate -nondestructive
 $env:VIRTUAL_ENV="__VENV_DIR__"
-# Set the prompt to include the env name
+if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {
-# Make sure _OLD_VIRTUAL_PROMPT is global
+    # Set the prompt to include the env name
-function global:_OLD_VIRTUAL_PROMPT {""}
+    # Make sure _OLD_VIRTUAL_PROMPT is global
-copy-item function:prompt function:_OLD_VIRTUAL_PROMPT
+    function global:_OLD_VIRTUAL_PROMPT {""}
-function global:prompt {
+    copy-item function:prompt function:_OLD_VIRTUAL_PROMPT
-    Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__'
+    function global:prompt {
-    _OLD_VIRTUAL_PROMPT
+        Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__'
+        _OLD_VIRTUAL_PROMPT
+    }
 }
 # Clear PYTHONHOME