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

Issue #25144: Ensures TargetDir is set before continuing with custom install.

This commit is contained in:
Steve Dower 2016-09-09 16:39:36 -07:00
parent 5272868e1f c87ae806ab
commit d6c580cbce
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -333,6 +333,9 @@ Build
Windows Windows
------- -------
- Issue #25144: Ensures TargetDir is set before continuing with custom
install.
- Issue #1602: Windows console doesn't input or print Unicode (PEP 528) - Issue #1602: Windows console doesn't input or print Unicode (PEP 528)
- Issue #27781: Change file system encoding on Windows to UTF-8 (PEP 529) - Issue #27781: Change file system encoding on Windows to UTF-8 (PEP 529)

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

@ -323,6 +323,9 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
case ID_CUSTOM_INSTALL_BUTTON: case ID_CUSTOM_INSTALL_BUTTON:
SavePageSettings(); SavePageSettings();
hr = EnsureTargetDir();
ExitOnFailure(hr, L"Failed to set TargetDir");
hr = BalGetStringVariable(L"TargetDir", &targetDir); hr = BalGetStringVariable(L"TargetDir", &targetDir);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
// TODO: Check whether directory exists and contains another installation // TODO: Check whether directory exists and contains another installation