From bf93aec4cea2204e13571d78d7d94ef3590791b8 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Wed, 30 May 2018 15:31:11 +0300 Subject: [PATCH 1/2] Fix license generation error --- Tools/msi/msi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 65ce5c153cfff8..da4a1c3d95981b 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"), From 5d10ea83ca2c5f03bf2e5b034b7fe5e7877217e3 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sun, 24 Jun 2018 12:09:47 -0500 Subject: [PATCH 2/2] Add blurb --- .../NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Windows/2018-06-24-12-09-23.bpo-33711.LpO0s1.rst 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 00000000000000..e97b811bae48f9 --- /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.