From 9a4c7da508a5378c1b59608c02aa7f4d3ad065e4 Mon Sep 17 00:00:00 2001 From: Aohan Dang Date: Sun, 11 Sep 2022 13:55:09 -0400 Subject: [PATCH 1/2] Ensure upgradability between official and buildrelease.bat releases As of ce21a9bff3c419584c28848cafa661261e43d775, Windows installations created using buildrelease.bat cannot be used to upgrade to/from official Python installations. Official Python releases use a RELEASE_URI with a scheme of http, while buildrelease.bat was changed to use a RELEASE_URI with a scheme of https. This changes the value in buildrelease.bat to match that of official releases. --- Tools/msi/buildrelease.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index ccec4da12c4285..839f6204d9e0b2 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -12,7 +12,9 @@ rem rem The following substitutions will be applied to the release URI: rem Variable Description Example rem {arch} architecture amd64, win32 -set RELEASE_URI=https://www.python.org/{arch} +rem Do not change the scheme to https. Otherwise, releases built with this +rem script will not be upgradable to/from official releases of Python. +set RELEASE_URI=http://www.python.org/{arch} rem This is the URL that will be used to download installation files. rem The files available from the default URL *will* conflict with your From 97f628258557c6dad4a3db482b062c6f1ced7d5f Mon Sep 17 00:00:00 2001 From: Aohan Dang Date: Sun, 11 Sep 2022 14:27:39 -0400 Subject: [PATCH 2/2] Add blurb --- .../next/Build/2022-09-11-14-23-49.gh-issue-96729.W4uBWL.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2022-09-11-14-23-49.gh-issue-96729.W4uBWL.rst diff --git a/Misc/NEWS.d/next/Build/2022-09-11-14-23-49.gh-issue-96729.W4uBWL.rst b/Misc/NEWS.d/next/Build/2022-09-11-14-23-49.gh-issue-96729.W4uBWL.rst new file mode 100644 index 00000000000000..b67cd200e2d346 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2022-09-11-14-23-49.gh-issue-96729.W4uBWL.rst @@ -0,0 +1,2 @@ +Ensure that Windows releases built with ``Tools\msi\buildrelease.bat`` are +upgradable to and from official Python releases.