diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-05-20 22:39:11 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-05-20 22:39:11 (GMT) |
| commit | 067e48b7d8970210d543af339ce56f64fa629a9a (patch) | |
| tree | 8d81e02e6a1498845e1937270e72476995dbf1ae | |
| parent | 1eae2237e1f2e302e0061e13c2e03a54431005a9 (diff) | |
| parent | bfc8f26ec276ca1bb2b90249d9eb2aed76293182 (diff) | |
| download | cpython-067e48b7d8970210d543af339ce56f64fa629a9a.zip cpython-067e48b7d8970210d543af339ce56f64fa629a9a.tar.gz cpython-067e48b7d8970210d543af339ce56f64fa629a9a.tar.bz2 | |
Closes #17743: Merged fix from 3.3.
| -rw-r--r-- | Lib/venv/scripts/nt/activate.bat | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat index c45e65a..3cebe26 100644 --- a/Lib/venv/scripts/nt/activate.bat +++ b/Lib/venv/scripts/nt/activate.bat @@ -1,31 +1,32 @@ @echo off
-set VIRTUAL_ENV=__VENV_DIR__
+set "VIRTUAL_ENV=__VENV_DIR__"
if not defined PROMPT (
- set PROMPT=$P$G
+ set "PROMPT=$P$G"
)
if defined _OLD_VIRTUAL_PROMPT (
- set PROMPT=%_OLD_VIRTUAL_PROMPT%
+ set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
)
if defined _OLD_VIRTUAL_PYTHONHOME (
- set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
+ set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
)
-set _OLD_VIRTUAL_PROMPT=%PROMPT%
-set PROMPT=__VENV_NAME__%PROMPT%
+set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
+set "PROMPT=__VENV_NAME__%PROMPT%"
if defined PYTHONHOME (
- set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
- set PYTHONHOME=
+ set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%"
+ set PYTHONHOME=
)
-if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%; goto SKIPPATH
-
-set _OLD_VIRTUAL_PATH=%PATH%
+if defined _OLD_VIRTUAL_PATH (
+ set "PATH=%_OLD_VIRTUAL_PATH%"
+) else (
+ set "_OLD_VIRTUAL_PATH=%PATH%"
+)
-:SKIPPATH
-set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%
+set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
:END
|