mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
(cherry picked from commit 96d8ca7ad6)

Co-authored-by: Steve Dower <steve.dower@python.org>
This commit is contained in:
Miss Islington (bot) 2024-04-29 23:16:17 +02:00 • committed by GitHub
parent 8e7486f41d
commit 97c0194c9f
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

1
Misc/NEWS.d/next/Windows/2024-04-29-13-53-25.gh-issue-118347.U5ZRm_.rst Normal file
View file

@ -0,0 +1 @@
Fixes launcher updates not being installed.

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

@ -464,11 +464,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
LOC_STRING *pLocString = nullptr; LOC_STRING *pLocString = nullptr;
LPCWSTR locKey = L"#(loc.Include_launcherHelp)"; 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)"; 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)"; locKey = L"#(loc.Include_launcherUpgrade)";
} }
@ -2671,7 +2671,7 @@ private:
/*Elevate when installing for all users*/ /*Elevate when installing for all users*/
L"InstallAllUsers or " L"InstallAllUsers or "
/*Elevate when installing the launcher for all users and it was not detected*/ /*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")",
L"" L""
}; };

4
Tools/msi/bundle/packagegroups/launcher.wxs
View file

@ -11,7 +11,7 @@
EnableFeatureSelection="yes" EnableFeatureSelection="yes"
Permanent="yes" Permanent="yes"
Visible="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" ?> <?if $(var.Platform)~="ARM64" ?>
<MsiProperty Name="ARM64_SHELLEXT" Value="1" /> <MsiProperty Name="ARM64_SHELLEXT" Value="1" />
<?endif ?> <?endif ?>
@ -25,7 +25,7 @@
EnableFeatureSelection="yes" EnableFeatureSelection="yes"
Permanent="yes" Permanent="yes"
Visible="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" ?> <?if $(var.Platform)~="ARM64" ?>
<MsiProperty Name="ARM64_SHELLEXT" Value="1" /> <MsiProperty Name="ARM64_SHELLEXT" Value="1" />
<?endif ?> <?endif ?>