traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36441: Fixes creating a venv when debug binaries are installed. (GH-12566) 

(cherry picked from commit 4a9a505d6f)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
This commit is contained in:
Miss Islington (bot) 2019-03-27 08:47:57 -07:00 committed by GitHub
parent 101ddba62d
commit 65445f65e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/venv/__init__.py
View File

@ -193,6 +193,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)

1
Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst Normal file
View File

@ -0,0 +1 @@
Fixes creating a venv when debug binaries are installed.

15
Tools/msi/lib/lib_files.wxs
View File

@ -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>