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 | 6889635186ceada6fa822cf689cfb6c01cb43ef9 (patch) | |
tree | 095cb1bdb6a09592888bc01c0ec58f160d78d331 /Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | |
parent | dfed23bfd9ea75f545b69bb98ace0a7f90615c7b (diff) | |
parent | f22209ce35fbcfb76529611d5fa592c5f3997697 (diff) | |
download | cpython-6889635186ceada6fa822cf689cfb6c01cb43ef9.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 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 |