Commit96d8ca7

authored

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

1 parent2ba1aed commit96d8ca7Copy full SHA for 96d8ca7

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixes launcher updates not being installed.`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -464,11 +464,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {`
`464`	`464`
`465`	`465`	`LOC_STRING *pLocString =nullptr;`
`466`	`466`	`LPCWSTR locKey =L"#(loc.Include_launcherHelp)";`
`467`		`- LONGLONGdetectedLauncher;`
	`467`	`+ LONGLONGblockedLauncher;`
`468`	`468`
`469`		`-if (SUCCEEDED(BalGetNumericVariable(L"DetectedLauncher", &detectedLauncher)) &&detectedLauncher) {`
	`469`	`+if (SUCCEEDED(BalGetNumericVariable(L"BlockedLauncher", &blockedLauncher)) &&blockedLauncher) {`
`470`	`470`	`locKey =L"#(loc.Include_launcherRemove)";`
`471`		`- }elseif (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher", &detectedLauncher)) &&detectedLauncher) {`
	`471`	`+ }elseif (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher", &blockedLauncher)) &&blockedLauncher) {`
`472`	`472`	`locKey =L"#(loc.Include_launcherUpgrade)";`
`473`	`473`	`}`
`474`	`474`
`@@ -2671,7 +2671,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {`
`2671`	`2671`	`/Elevate when installing for all users/`
`2672`	`2672`	`L"InstallAllUsers or"`
`2673`	`2673`	`/Elevate when installing the launcher for all users and it was not detected/`
`2674`		`-L"(Include_launcher and InstallLauncherAllUsers and notDetectedLauncher)"`
	`2674`	`+L"(Include_launcher and InstallLauncherAllUsers and notBlockedLauncher)"`
`2675`	`2675`	`L")",`
`2676`	`2676`	`L""`
`2677`	`2677`	`};`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`EnableFeatureSelection="yes"`
`12`	`12`	`Permanent="yes"`
`13`	`13`	`Visible="yes"`
`14`		`-InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and notDetectedLauncher">`
	`14`	`+InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and notBlockedLauncher">`
`15`	`15`	`<?if $(var.Platform)~="ARM64" ?>`
`16`	`16`	`<MsiPropertyName="ARM64_SHELLEXT"Value="1" />`
`17`	`17`	`<?endif ?>`
`@@ -25,7 +25,7 @@`
`25`	`25`	`EnableFeatureSelection="yes"`
`26`	`26`	`Permanent="yes"`
`27`	`27`	`Visible="yes"`
`28`		`-InstallCondition="not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and notDetectedLauncher">`
	`28`	`+InstallCondition="not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and notBlockedLauncher">`
`29`	`29`	`<?if $(var.Platform)~="ARM64" ?>`
`30`	`30`	`<MsiPropertyName="ARM64_SHELLEXT"Value="1" />`
`31`	`31`	`<?endif ?>`

Comments

(0)