From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Mon, 7 Oct 2019 21:25:06 +0000 (-0700) Subject: bpo-38344: Fix syntax in activate.bat (GH-16533) X-Git-Tag: v3.7.5~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab22c8bc488e822d03c4778b30ec60131ea35c63;p=thirdparty%2FPython%2Fcpython.git bpo-38344: Fix syntax in activate.bat (GH-16533) (cherry picked from commit e310af9e2941c2fbb7370e003276cc37eb230f16) Co-authored-by: James Abel --- diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat index 8eb5c1ff664f..af4c7e0abacb 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 000000000000..b5854d1ecb0d --- /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