[Python-checkins] cpython (3.5): Fixes #29308: Respect VIRTUAL_ENV_DISABLE_PROMPT in Activate.ps1.

[vinay.sajip]

https://hg.python.org/cpython/rev/91b949dc1984
changeset:   106320:91b949dc1984
branch:      3.5
parent:      106312:96f5327f7253
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Jan 27 12:41:27 2017 +0000
summary:
  Fixes #29308: Respect VIRTUAL_ENV_DISABLE_PROMPT in Activate.ps1.

files:
  Lib/venv/scripts/nt/Activate.ps1 |  16 +++++++++-------
  1 files changed, 9 insertions(+), 7 deletions(-)


diff --git a/Lib/venv/scripts/nt/Activate.ps1 b/Lib/venv/scripts/nt/Activate.ps1
--- a/Lib/venv/scripts/nt/Activate.ps1
+++ b/Lib/venv/scripts/nt/Activate.ps1
@@ -29,13 +29,15 @@
 
 $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

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