[Python-checkins] cpython (merge 3.5 -> default): Issue #25144: Ensures TargetDir is set before continuing with custom install.

[steve.dower]

https://hg.python.org/cpython/rev/024f3312ccee
changeset:   103501:024f3312ccee
parent:      103498:741a87d212da
parent:      103500:16d652760a06
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Sep 09 16:39:36 2016 -0700
summary:
  Issue #25144: Ensures TargetDir is set before continuing with custom install.

files:
  Misc/NEWS                                                    |  3 +++
  Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp |  3 +++
  2 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -333,6 +333,9 @@
 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
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -323,6 +323,9 @@
         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

-- 
Repository URL: https://hg.python.org/cpython