Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixes default per-user install precompiling the standard library.

This commit is contained in:
Steve Dower 2015-05-15 12:10:53 -07:00
parent 0cd2bf46ba
commit 42b50d187f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View File

@ -302,10 +302,17 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
case ID_INSTALL_JUST_FOR_ME_BUTTON: case ID_INSTALL_JUST_FOR_ME_BUTTON:
SavePageSettings(); SavePageSettings();
if (!QueryElevateForCrtInstall()) {
break;
}
hr = _engine->SetVariableNumeric(L"InstallAllUsers", 0); hr = _engine->SetVariableNumeric(L"InstallAllUsers", 0);
ExitOnFailure(hr, L"Failed to set install scope"); ExitOnFailure(hr, L"Failed to set install scope");
hr = _engine->SetVariableNumeric(L"CompileAll", 0);
ExitOnFailure(hr, L"Failed to unset CompileAll");
hr = BalGetStringVariable(L"DefaultJustForMeTargetDir", &defaultDir); hr = BalGetStringVariable(L"DefaultJustForMeTargetDir", &defaultDir);
BalExitOnFailure(hr, "Failed to get the default per-user install directory"); BalExitOnFailure(hr, "Failed to get the default per-user install directory");
@ -320,10 +327,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
ReleaseStr(targetDir); ReleaseStr(targetDir);
BalExitOnFailure(hr, "Failed to set install target directory"); BalExitOnFailure(hr, "Failed to set install target directory");
if (!QueryElevateForCrtInstall()) {
break;
}
OnPlan(BOOTSTRAPPER_ACTION_INSTALL); OnPlan(BOOTSTRAPPER_ACTION_INSTALL);
break; break;