https://github.com/python/cpython/commit/96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2
commit: 96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2
branch: main
author: Steve Dower <[email protected]>
committer: zooba <[email protected]>
date: 2024-04-29T21:46:25+01:00
summary:
gh-118347: Fix Windows installer not updating launcher (GH-118386)
files:
A Misc/NEWS.d/next/Windows/2024-04-29-13-53-25.gh-issue-118347.U5ZRm_.rst
M Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
M Tools/msi/bundle/packagegroups/launcher.wxs
diff --git
a/Misc/NEWS.d/next/Windows/2024-04-29-13-53-25.gh-issue-118347.U5ZRm_.rst
b/Misc/NEWS.d/next/Windows/2024-04-29-13-53-25.gh-issue-118347.U5ZRm_.rst
new file mode 100644
index 00000000000000..8f02ed94f100fe
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-04-29-13-53-25.gh-issue-118347.U5ZRm_.rst
@@ -0,0 +1 @@
+Fixes launcher updates not being installed.
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index e0e179e3aede6d..7cddda9b06555d 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -464,11 +464,11 @@ class PythonBootstrapperApplication : public
CBalBaseBootstrapperApplication {
LOC_STRING *pLocString = nullptr;
LPCWSTR locKey = L"#(loc.Include_launcherHelp)";
- LONGLONG detectedLauncher;
+ LONGLONG blockedLauncher;
- if (SUCCEEDED(BalGetNumericVariable(L"DetectedLauncher",
&detectedLauncher)) && detectedLauncher) {
+ if (SUCCEEDED(BalGetNumericVariable(L"BlockedLauncher",
&blockedLauncher)) && blockedLauncher) {
locKey = L"#(loc.Include_launcherRemove)";
- } else if (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher",
&detectedLauncher)) && detectedLauncher) {
+ } else if (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher",
&blockedLauncher)) && blockedLauncher) {
locKey = L"#(loc.Include_launcherUpgrade)";
}
@@ -2671,7 +2671,7 @@ class PythonBootstrapperApplication : public
CBalBaseBootstrapperApplication {
/*Elevate when installing for all users*/
L"InstallAllUsers or "
/*Elevate when installing the launcher for all users and it
was not detected*/
- L"(Include_launcher and InstallLauncherAllUsers and not
DetectedLauncher)"
+ L"(Include_launcher and InstallLauncherAllUsers and not
BlockedLauncher)"
L")",
L""
};
diff --git a/Tools/msi/bundle/packagegroups/launcher.wxs
b/Tools/msi/bundle/packagegroups/launcher.wxs
index a6922758f31f14..080598a0a486ef 100644
--- a/Tools/msi/bundle/packagegroups/launcher.wxs
+++ b/Tools/msi/bundle/packagegroups/launcher.wxs
@@ -11,7 +11,7 @@
EnableFeatureSelection="yes"
Permanent="yes"
Visible="yes"
- InstallCondition="(InstallAllUsers or
InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher">
+ InstallCondition="(InstallAllUsers or
InstallLauncherAllUsers) and Include_launcher and not BlockedLauncher">
<?if $(var.Platform)~="ARM64" ?>
<MsiProperty Name="ARM64_SHELLEXT" Value="1" />
<?endif ?>
@@ -25,7 +25,7 @@
EnableFeatureSelection="yes"
Permanent="yes"
Visible="yes"
- InstallCondition="not (InstallAllUsers or
InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher">
+ InstallCondition="not (InstallAllUsers or
InstallLauncherAllUsers) and Include_launcher and not BlockedLauncher">
<?if $(var.Platform)~="ARM64" ?>
<MsiProperty Name="ARM64_SHELLEXT" Value="1" />
<?endif ?>
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
