summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornative-api <ivan_pozdeev@mail.ru>2018-06-25 01:50:23 +0300
committerZachary Ware <zachary.ware@gmail.com>2018-06-24 17:50:23 -0500
commitb18f09835720e14ac7d4cca1815fdcdcecd5d8d4 (patch)
tree584edc130dba280baf610a6f518da363b37d1384
parent2c11e23a5a686edc69bcbb4c65f500d50d992bb3 (diff)
downloadcpython-git-b18f09835720e14ac7d4cca1815fdcdcecd5d8d4.tar.gz
bpo-33711: Fix license generation error in installer build script (GH-7241)
-rw-r--r--Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst1
-rw-r--r--Tools/msi/msi.py2
2 files changed, 2 insertions, 1 deletions
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 0000000000..e97b811bae
--- /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 65ce5c153c..da4a1c3d95 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"),