bpo-36441: Fixes creating a venv when debug binaries are installed. (… · python/cpython@65445f6 (original) (raw)
Navigation Menu
- GitHub Copilot Write better code with AI
- GitHub Models New Manage and compare prompts
- GitHub Advanced Security Find and fix vulnerabilities
- Actions Automate any workflow
- Codespaces Instant dev environments
- Issues Plan and track work
- Code Review Manage code changes
- Discussions Collaborate outside of code
- Code Search Find more, search less
- Explore
- Pricing
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Appearance settings
Commit 65445f6
and
authored
bpo-36441: Fixes creating a venv when debug binaries are installed. (GH-12566)
(cherry picked from commit 4a9a505) Co-authored-by: Steve Dower steve.dower@microsoft.com
File tree
3 files changed
lines changed
3 files changed
lines changed
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -193,6 +193,9 @@ def symlink_or_copy(self, src, dst, relative_symlinks_ok=False): | ||
| 193 | 193 | src = os.path.join(os.path.dirname(src), basename + ext) |
| 194 | 194 | else: |
| 195 | 195 | src = srcfn |
| 196 | +if not os.path.exists(src): | |
| 197 | +logger.warning('Unable to copy %r', src) | |
| 198 | +return | |
| 196 | 199 | |
| 197 | 200 | shutil.copyfile(src, dst) |
| 198 | 201 |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 1 | +Fixes creating a venv when debug binaries are installed. |
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -69,6 +69,15 @@ | ||
| 69 | 69 | </Fragment> |
| 70 | 70 | |
| 71 | 71 | <Fragment> |
| 72 | + | |
| 73 | + <DirectoryRef Id="Lib"> | |
| 74 | + <Directory Id="Lib_venv__d" Name="venv"> | |
| 75 | + <Directory Id="Lib_venv_scripts__d" Name="scripts"> | |
| 76 | + <Directory Id="Lib_venv_scripts_nt__d" Name="nt" /> | |
| 77 | + </Directory> | |
| 78 | + </Directory> | |
| 79 | + </DirectoryRef> | |
| 80 | + | |
| 72 | 81 | <ComponentGroup Id="lib_extensions_d"> |
| 73 | 82 | |
| 74 | 83 | |
| @@ -87,6 +96,12 @@ | ||
| 87 | 96 | <Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*"> |
| 88 | 97 | <File Name="sqlite3_d.pdb" KeyPath="yes" /> |
| 89 | 98 | </Component> |
| 99 | + <Component Id="venvlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*"> | |
| 100 | + <File Name="python_d.exe" Source="venvlauncher_d.exe" KeyPath="yes" /> | |
| 101 | + </Component> | |
| 102 | + <Component Id="venvwlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*"> | |
| 103 | + <File Name="pythonw_d.exe" Source="venvwlauncher_d.exe" KeyPath="yes" /> | |
| 104 | + </Component> | |
| 90 | 105 | </ComponentGroup> |
| 91 | 106 | </Fragment> |
| 92 | 107 | <Fragment> |