]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-33711: Fix license generation error in installer build script (GH-7241)
authornative-api <ivan_pozdeev@mail.ru>
Sun, 24 Jun 2018 22:50:23 +0000 (01:50 +0300)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 24 Jun 2018 22:50:23 +0000 (17:50 -0500)
Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst [new file with mode: 0644]
Tools/msi/msi.py

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 (file)
index 0000000..e97b811
--- /dev/null
@@ -0,0 +1 @@
+Fixed licence generation error when building the installer.
index 65ce5c153cfff86b9bc46d1ece6d26c025b99766..da4a1c3d95981b3958e4c31a1e455b56f7245629 100644 (file)
@@ -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"),