8000 [3.8] bpo-39930: Convert error to warning for more silent failure (GH-18921) by miss-islington · Pull Request #18923 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.8] bpo-39930: Convert error to warning for more silent failure (GH-18921) #18923

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
merged 1 commit into from
Mar 11, 2020
Merged

[3.8] bpo-39930: Convert error to warning for more silent failure (GH-18921) #18923

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
bpo-39930: Convert error to warning for more silent failure (GH-18921) 
Makes it an error to create a layout without vcruntime DLL
(cherry picked from commit fde44ae)

Co-authored-by: Steve Dower <steve.dower@python.org>
  • Loading branch information
@zooba @miss-islington
zooba authored and miss-islington committed Mar 11, 2020
commit e507faee1f88d9a3b057098edba5fc3778e3023c
4 changes: 4 additions & 0 deletions PC/layout/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,12 @@ def in_build(f, dest="", new_name=None):
if ns.include_stable:
yield from in_build(PYTHON_STABLE_DLL_NAME)

found_any = False
for dest, src in rglob(ns.build, "vcruntime*.dll"):
found_any = True
yield dest, src
if not found_any:
log_error("Failed to locate vcruntime DLL in the build.")

yield "LICENSE.txt", ns.build / "LICENSE.txt"

Expand Down
2 changes: 1 addition & 1 deletion PCbuild/pyproject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public override bool Execute() {
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
</ItemGroup>

<Error Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
<Warning Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
<Message Text="VCRuntimeDLL: @(VCRuntimeDLL)" Importance="high" />
</Target>
</Project>
0