diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 16:37:53 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 16:37:53 -0700 |
| commit | f22209ce35fbcfb76529611d5fa592c5f3997697 (patch) | |
| tree | 04139f841ee35841824fa12de149a05736af34c6 /Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | |
| parent | 0ddee84316bf00a991aec0bc8d5f90e601892876 (diff) | |
| download | cpython-f22209ce35fbcfb76529611d5fa592c5f3997697.tar.gz | |
Issue #25144: Ensures TargetDir is set before continuing with custom install.
Diffstat (limited to 'Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index b7b2ecf39b..6a67ee211c 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 |