From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 11 Mar 2020 14:31:07 +0000 (-0700)
Subject: bpo-39930: Convert error to warning for more silent failure (GH-18921)
X-Git-Tag: v3.8.3rc1~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17571c54e03822685656dc7d118a5ddcf8cb58af;p=thirdparty%2FPython%2Fcpython.git

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 fde44ae6d08d3df79554155b1cf079e73a8fabdd)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/PC/layout/main.py b/PC/layout/main.py
index 305cb517d0f7..3eef7556299c 100644
--- a/PC/layout/main.py
+++ b/PC/layout/main.py
@@ -173,8 +173,12 @@ def get_layout(ns):
     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
index 80221333bee6..51ae58b002fc 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -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>