diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2019-03-27 15:14:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 15:14:53 (GMT) |
| commit | 4a9a505d6f2474a570422dad89f8d1b344d6cd36 (patch) | |
| tree | beb530c17126c4b3b2b7355f97cb10b3eee88c99 | |
| parent | f4333d0479d6974d142e858522e95cbf8381f016 (diff) | |
| download | cpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.zip cpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.tar.gz cpython-4a9a505d6f2474a570422dad89f8d1b344d6cd36.tar.bz2 | |
bpo-36441: Fixes creating a venv when debug binaries are installed. (#12566)
| -rw-r--r-- | Lib/venv/__init__.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst | 1 | ||||
| -rw-r--r-- | Tools/msi/lib/lib_files.wxs | 15 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 5e6d375..4a49b24 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -195,6 +195,9 @@ class EnvBuilder: src = os.path.join(os.path.dirname(src), basename + ext) else: src = srcfn + if not os.path.exists(src): + logger.warning('Unable to copy %r', src) + return shutil.copyfile(src, dst) diff --git a/Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst b/Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst new file mode 100644 index 0000000..b27abff --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst @@ -0,0 +1 @@ +Fixes creating a venv when debug binaries are installed. diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs index a9952bd..251f9b1 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -69,6 +69,15 @@ </Fragment> <Fragment> + <!-- The auto-generated directory is not available when building debug binaries --> + <DirectoryRef Id="Lib"> + <Directory Id="Lib_venv__d" Name="venv"> + <Directory Id="Lib_venv_scripts__d" Name="scripts"> + <Directory Id="Lib_venv_scripts_nt__d" Name="nt" /> + </Directory> + </Directory> + </DirectoryRef> + <ComponentGroup Id="lib_extensions_d"> <?foreach ext in $(var.exts)?> @@ -87,6 +96,12 @@ <Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*"> <File Name="sqlite3_d.pdb" KeyPath="yes" /> </Component> + <Component Id="venvlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*"> + <File Name="python_d.exe" Source="venvlauncher_d.exe" KeyPath="yes" /> + </Component> + <Component Id="venvwlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*"> + <File Name="pythonw_d.exe" Source="venvwlauncher_d.exe" KeyPath="yes" /> + </Component> </ComponentGroup> </Fragment> <Fragment> |