changeset:   103500:16d652760a06
branch:      3.5
parent:      103495:8c00cbbd3ff9
user:        Steve Dower <steve.dower@microsoft.com>
date:        Fri Sep 09 16:37:53 2016 -0700
files:       Misc/NEWS Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
description:
Issue #25144: Ensures TargetDir is set before continuing with custom install.


diff -r 8c00cbbd3ff9 -r 16d652760a06 Misc/NEWS
--- a/Misc/NEWS	Fri Sep 09 15:57:13 2016 -0700
+++ b/Misc/NEWS	Fri Sep 09 16:37:53 2016 -0700
@@ -275,6 +275,9 @@
 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 -r 8c00cbbd3ff9 -r 16d652760a06 Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp	Fri Sep 09 15:57:13 2016 -0700
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp	Fri Sep 09 16:37:53 2016 -0700
@@ -327,6 +327,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