Skip to content

bpo-36441: Fixes creating a venv when debug binaries are installed. #12566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 1 commit into from
Mar 27, 2019
Merged

bpo-36441: Fixes creating a venv when debug binaries are installed. #12566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/venv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):
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)

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2019-03-26-11-46-15.bpo-36441.lYjGF1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes creating a venv when debug binaries are installed.
15 changes: 15 additions & 0 deletions Tools/msi/lib/lib_files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?>

Expand All @@ -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>
Expand Down