summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-03-11 14:31:07 (GMT)
committerGitHub <noreply@github.com>2020-03-11 14:31:07 (GMT)
commit17571c54e03822685656dc7d118a5ddcf8cb58af (patch)
tree5d6743670046e7341819deafd05955d7b25ac78c /PC
parentd01c5507e5f9bd5072d94f007d29b37f41c6e6b5 (diff)
downloadcpython-17571c54e03822685656dc7d118a5ddcf8cb58af.zip
cpython-17571c54e03822685656dc7d118a5ddcf8cb58af.tar.gz
cpython-17571c54e03822685656dc7d118a5ddcf8cb58af.tar.bz2
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>
Diffstat (limited to 'PC')
-rw-r--r--PC/layout/main.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/PC/layout/main.py b/PC/layout/main.py
index 305cb51..3eef755 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"