diff options
| author | Steve Dower <steve.dower@python.org> | 2024-04-29 20:46:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 20:46:25 (GMT) |
| commit | 96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2 (patch) | |
| tree | cb7a679cab1276614b23596a4857ddcc897d3cea /Tools | |
| parent | 2ba1aed596ff9e7c5e193cf990f1f20f08bbf116 (diff) | |
| download | cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.zip cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.tar.gz cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.tar.bz2 | |
gh-118347: Fix Windows installer not updating launcher (GH-118386)
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 8 | ||||
| -rw-r--r-- | Tools/msi/bundle/packagegroups/launcher.wxs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index e0e179e..7cddda9 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 @@ private: /*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 a692275..080598a 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 ?> |