From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 28 Dec 2018 01:04:07 +0000 (-0800)
Subject: bpo-35596: Fix vcruntime140.dll being added to embeddable distro multiple times.... 
X-Git-Tag: v3.7.3rc1~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbf695441af9def8a121ff3e245415d9fc0bab9a;p=thirdparty%2FPython%2Fcpython.git

bpo-35596: Fix vcruntime140.dll being added to embeddable distro multiple times. (GH-11329)


https://bugs.python.org/issue35596
(cherry picked from commit 59c2aa25ffc864bf11bf3b3973828f00e268a992)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---

diff --git a/Misc/NEWS.d/next/Windows/2018-12-28-07-25-47.bpo-35596.P9CEY2.rst b/Misc/NEWS.d/next/Windows/2018-12-28-07-25-47.bpo-35596.P9CEY2.rst
new file mode 100644
index 000000000000..3ce90f6065c9
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-12-28-07-25-47.bpo-35596.P9CEY2.rst
@@ -0,0 +1 @@
+Fix vcruntime140.dll being added to embeddable distro multiple times.
diff --git a/PC/layout/main.py b/PC/layout/main.py
index 217b2b096e07..7eaf201d532e 100644
--- a/PC/layout/main.py
+++ b/PC/layout/main.py
@@ -46,7 +46,7 @@ TCLTK_FILES_ONLY = FileNameSet("turtle.py")
 
 VENV_DIRS_ONLY = FileNameSet("venv", "ensurepip")
 
-EXCLUDE_FROM_PYDS = FileStemSet("python*", "pyshellext")
+EXCLUDE_FROM_PYDS = FileStemSet("python*", "pyshellext", "vcruntime*")
 EXCLUDE_FROM_LIB = FileNameSet("*.pyc", "__pycache__", "*.pickle")
 EXCLUDE_FROM_PACKAGED_LIB = FileNameSet("readme.txt")
 EXCLUDE_FROM_COMPILE = FileNameSet("badsyntax_*", "bad_*")