summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-10-07 21:26:57 (GMT)
committerGitHub <noreply@github.com>2019-10-07 21:26:57 (GMT)
commit4880e5a1b66d9175fcc402cb0288bc1898356831 (patch)
tree3a3e2354854d57e491d57a0876ddac6934751523
parentb731fc521cf78e53268e35777d836ca80e7ab305 (diff)
downloadcpython-4880e5a1b66d9175fcc402cb0288bc1898356831.zip
cpython-4880e5a1b66d9175fcc402cb0288bc1898356831.tar.gz
cpython-4880e5a1b66d9175fcc402cb0288bc1898356831.tar.bz2
bpo-38344: Fix syntax in activate.bat (GH-16533)
(cherry picked from commit e310af9e2941c2fbb7370e003276cc37eb230f16) Co-authored-by: James Abel <j@abel.co>
-rw-r--r--Lib/venv/scripts/nt/activate.bat2
-rw-r--r--Misc/NEWS.d/next/Windows/2019-10-05-05-50-58.bpo-38344.scr2LO.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index 8eb5c1f..af4c7e0 100644
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -22,7 +22,7 @@ if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
set PYTHONHOME=
if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
-else set _OLD_VIRTUAL_PATH=%PATH%
+if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%
set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%
diff --git a/Misc/NEWS.d/next/Windows/2019-10-05-05-50-58.bpo-38344.scr2LO.rst b/Misc/NEWS.d/next/Windows/2019-10-05-05-50-58.bpo-38344.scr2LO.rst
new file mode 100644
index 0000000..b5854d1
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-10-05-05-50-58.bpo-38344.scr2LO.rst
@@ -0,0 +1 @@
+Fix error message in activate.bat