Fix broken prompt set up by activate.bat (#2225) (#2226)

pypa · Oct 28, 2021 · 31f3913 · 31f3913
1 parent 653d4eb
commit 31f3913
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docs/changelog/2225.bugfix.rst b/docs/changelog/2225.bugfix.rst
@@ -0,0 +1 @@
+Fix broken prompt set up by activate.bat - by :user:`SiggyBar`.
diff --git a/src/virtualenv/activation/batch/activate.bat b/src/virtualenv/activation/batch/activate.bat
@@ -13,11 +13,11 @@ if defined _OLD_VIRTUAL_PROMPT (
     )
 )
 if not defined VIRTUAL_ENV_DISABLE_PROMPT (
-    set "ENV_PROMPT=__VIRTUAL_PROMPT__"
-    if NOT DEFINED ENV_PROMPT (
-        for %%d in ("%VIRTUAL_ENV%") do set "ENV_PROMPT=(%%~nxd) "
+    if "__VIRTUAL_PROMPT__" NEQ "" (
+        set "PROMPT=__VIRTUAL_PROMPT__%PROMPT%"
+    ) else (
+        for %%d in ("%VIRTUAL_ENV%") do set "PROMPT=(%%~nxd) %PROMPT%"
     )
-    set "PROMPT=%ENV_PROMPT%%PROMPT%"
 )
 
 REM Don't use () to avoid problems with them in %PATH%