[Python-checkins] bpo-33711: Fix license generation error in installer build script (GH-7241)
Zachary Ware
webhook-mailer at python.org
Sun Jun 24 18:50:26 EDT 2018
https://github.com/python/cpython/commit/b18f09835720e14ac7d4cca1815fdcdcecd5d8d4
commit: b18f09835720e14ac7d4cca1815fdcdcecd5d8d4
branch: 2.7
author: native-api <ivan_pozdeev at mail.ru>
committer: Zachary Ware <zachary.ware at gmail.com>
date: 2018-06-24T17:50:23-05:00
summary:
bpo-33711: Fix license generation error in installer build script (GH-7241)
files:
A Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst
M 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
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"),
More information about the Python-checkins
mailing list