From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 30 Sep 2024 01:06:11 +0000 (+0200)
Subject: [3.13] gh-124254: Detect freethreaded MSI component when doing an upgrade on Windows... 
X-Git-Tag: v3.13.0rc3~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f101dcfebf5acc4bf3a809a58b044001ee423c1;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-124254: Detect freethreaded MSI component when doing an upgrade on Windows (GH-124279) (#124347)

gh-124254: Detect freethreaded MSI component when doing an upgrade on Windows (GH-124279)
(cherry picked from commit df7228ce140ecb005d44a0c171ba4d098b3fa67c)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/Misc/NEWS.d/next/Windows/2024-09-20-11-18-50.gh-issue-124254.iPin-L.rst b/Misc/NEWS.d/next/Windows/2024-09-20-11-18-50.gh-issue-124254.iPin-L.rst
new file mode 100644
index 000000000000..b93e356edb50
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-09-20-11-18-50.gh-issue-124254.iPin-L.rst
@@ -0,0 +1 @@
+Ensures experimental free-threaded binaries remain installed when updating.
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 7cddda9b0655..094ddba4f1ad 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -213,6 +213,7 @@ static struct { LPCWSTR regName; LPCWSTR variableName; } OPTIONAL_FEATURES[] = {
     { L"Shortcuts", L"Shortcuts" },
     // Include_launcher and AssociateFiles are handled separately and so do
     // not need to be included in this list.
+    { L"freethreaded", L"Include_freethreaded" },
     { nullptr, nullptr }
 };