Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 13:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-118347: Fix Windows installer not updating launcher (GH-118386)

Browse source
This commit is contained in:
Steve Dower 2024-04-29 21:46:25 +01:00 • committed by GitHub
parent 2ba1aed596
commit 96d8ca7ad6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file

@ -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""
};