bpo-39930: Convert error to warning for more silent failure (pythonGH…

…-18921) Makes it an error to create a layout without vcruntime DLL
miss-islington · Mar 11, 2020 · fde44ae · fde44ae
1 parent 3c97e1e
commit fde44ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/PC/layout/main.py b/PC/layout/main.py
@@ -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"
 

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
@@ -217,7 +217,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>