mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-12 19:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #25071: Windows installer should not require TargetDir parameter when installing quietly

Browse Source
This commit is contained in:
Steve Dower 2015-09-11 11:31:07 -07:00
commit a004c54f94
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Misc/NEWS
View File

@ -189,6 +189,22 @@ Build
when external libraries are not available.
Windows
-------
- Issue #25022: Removed very outdated PC/example_nt/ directory.
What's New in Python 3.5.0 final?
=================================
Release date: 2015-09-13
Build
-----
- Issue #25071: Windows installer should not require TargetDir
parameter when installing quietly
What's New in Python 3.5.0 release candidate 4?
===============================================

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

@ -723,6 +723,36 @@ public: // IBootstrapperApplication
hrStatus = EvaluateConditions();
}
if (SUCCEEDED(hrStatus)) {
// Ensure the default path has been set
LONGLONG installAll;
LPWSTR targetDir = nullptr;
LPWSTR defaultTargetDir = nullptr;
hrStatus = BalGetStringVariable(L"TargetDir", &targetDir);
if (FAILED(hrStatus) || !targetDir || !targetDir[0]) {
ReleaseStr(targetDir);
targetDir = nullptr;
if (FAILED(BalGetNumericVariable(L"InstallAllUsers", &installAll))) {
installAll = 0;
}
hrStatus = BalGetStringVariable(
installAll ? L"DefaultAllUsersTargetDir" : L"DefaultJustForMeTargetDir",
&defaultTargetDir
);
if (SUCCEEDED(hrStatus) && defaultTargetDir) {
if (defaultTargetDir[0] && SUCCEEDED(BalFormatString(defaultTargetDir, &targetDir))) {
hrStatus = _engine->SetVariableString(L"TargetDir", targetDir);
ReleaseStr(targetDir);
}
ReleaseStr(defaultTargetDir);
}
}
}
SetState(PYBA_STATE_DETECTED, hrStatus);
// If we're not interacting with the user or we're doing a layout or we're just after a force restart