diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 23:37:53 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 23:37:53 (GMT) |
| commit | c87ae806abdf79dd5d000aaec47596122a93b29b (patch) | |
| tree | a28d218f3324f96fd7f38aa9675b3f09758aba4a | |
| parent | 87dc4d61890b4ed1c74b1f5e7256b3aa2080a499 (diff) | |
| download | cpython-c87ae806abdf79dd5d000aaec47596122a93b29b.zip cpython-c87ae806abdf79dd5d000aaec47596122a93b29b.tar.gz cpython-c87ae806abdf79dd5d000aaec47596122a93b29b.tar.bz2 | |
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
@@ -275,6 +275,9 @@ Tools/Demos Windows ------- +- Issue #25144: Ensures TargetDir is set before continuing with custom + install. + - Issue #27469: Adds a shell extension to the launcher so that drag and drop works correctly. diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index b7b2ecf..6a67ee2 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -327,6 +327,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 |