diff options
| author | Steve Dower <steve.dower@python.org> | 2019-09-11 14:41:21 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2019-09-11 14:41:21 (GMT) |
| commit | 574b324bdc9a126b5a4488c3613f11ad2555415e (patch) | |
| tree | 5162264f35868c1dd1ba13d370e7f27c0e008931 | |
| parent | 6357c95716d89ac1f80587fbc4133df8d2e8396c (diff) | |
| download | cpython-574b324bdc9a126b5a4488c3613f11ad2555415e.zip cpython-574b324bdc9a126b5a4488c3613f11ad2555415e.tar.gz cpython-574b324bdc9a126b5a4488c3613f11ad2555415e.tar.bz2 | |
bpo-36634: Fixes activate.bat when existing values contain double quotes (GH-15924)
| -rw-r--r-- | Lib/venv/scripts/nt/activate.bat | 38 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst | 2 |
2 files changed, 15 insertions, 25 deletions
diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat index da831bb..8eb5c1f 100644 --- a/Lib/venv/scripts/nt/activate.bat +++ b/Lib/venv/scripts/nt/activate.bat @@ -2,44 +2,32 @@ rem This file is UTF-8 encoded, so we need to update the current code page while executing it for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do ( - set "_OLD_CODEPAGE=%%a" + set _OLD_CODEPAGE=%%a ) if defined _OLD_CODEPAGE ( "%SystemRoot%\System32\chcp.com" 65001 > nul ) -set "VIRTUAL_ENV=__VENV_DIR__" +set VIRTUAL_ENV=__VENV_DIR__ -if not defined PROMPT ( - set "PROMPT=$P$G" -) - -if defined _OLD_VIRTUAL_PROMPT ( - set "PROMPT=%_OLD_VIRTUAL_PROMPT%" -) +if not defined PROMPT set PROMPT=$P$G -if defined _OLD_VIRTUAL_PYTHONHOME ( - set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%" -) +if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT% +if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME% -set "_OLD_VIRTUAL_PROMPT=%PROMPT%" -set "PROMPT=__VENV_PROMPT__%PROMPT%" +set _OLD_VIRTUAL_PROMPT=%PROMPT% +set PROMPT=__VENV_PROMPT__%PROMPT% -if defined PYTHONHOME ( - set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%" - set PYTHONHOME= -) +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 defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH% +else set _OLD_VIRTUAL_PATH=%PATH% -set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%" +set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH% :END if defined _OLD_CODEPAGE ( "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul - set "_OLD_CODEPAGE=" + set _OLD_CODEPAGE= ) diff --git a/Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst b/Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst new file mode 100644 index 0000000..c0bd2be --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst @@ -0,0 +1,2 @@ +venv activate.bat now works when the existing variables contain double quote +characters. |