From: native-api <ivan_pozdeev@mail.ru>
Date: Sun, 24 Jun 2018 22:50:23 +0000 (+0300)
Subject: bpo-33711: Fix license generation error in installer build script (GH-7241)
X-Git-Tag: v2.7.16rc1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18f09835720e14ac7d4cca1815fdcdcecd5d8d4;p=thirdparty%2FPython%2Fcpython.git

bpo-33711: Fix license generation error in installer build script (GH-7241)
---

diff --git a/Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst b/Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst
new file mode 100644
index 000000000000..e97b811bae48
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst
@@ -0,0 +1 @@
+Fixed licence generation error when building the installer.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 65ce5c153cff..da4a1c3d9598 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -917,7 +917,7 @@ def generate_license():
     shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out)
     shutil.copyfileobj(open("crtlicense.txt"), out)
     for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
-                      ("Berkeley DB", "db-*", "LICENSE"),
+                      ("Berkeley DB", "bsddb-*", "LICENSE"),
                       ("openssl", "openssl-*", "LICENSE"),
                       ("Tcl", "tcl-8*", "license.terms"),
                       ("Tk", "tk-8*", "license.terms"),