diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 16:39:36 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 16:39:36 -0700 |
| commit | d6c580cbcea736fa3d57d4572b970c714c988b07 (patch) | |
| tree | 704f4c3b34776030aef06680d74b46f4cf9913c8 | |
| parent | 5272868e1f5513a94d32a4530d03a3696b3afbfb (diff) | |
| parent | c87ae806abdf79dd5d000aaec47596122a93b29b (diff) | |
| download | cpython-git-d6c580cbcea736fa3d57d4572b970c714c988b07.tar.gz | |
Issue #25144: Ensures TargetDir is set before continuing with custom install.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -333,6 +333,9 @@ Build 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 #27781: Change file system encoding on Windows to UTF-8 (PEP 529) diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 67726d6e17..e88981fc3a 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -323,6 +323,9 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { case ID_CUSTOM_INSTALL_BUTTON: SavePageSettings(); + hr = EnsureTargetDir(); + ExitOnFailure(hr, L"Failed to set TargetDir"); + hr = BalGetStringVariable(L"TargetDir", &targetDir); if (SUCCEEDED(hr)) { // TODO: Check whether directory exists and contains another installation |