[Python-checkins] cpython (3.5): Issue #25144: Ensures TargetDir is set before continuing with custom install.
steve.dower
python-checkins at python.org
Fri Sep 9 19:39:56 EDT 2016
https://hg.python.org/cpython/rev/16d652760a06
changeset: 103500:16d652760a06
branch: 3.5
parent: 103495:8c00cbbd3ff9
user: Steve Dower <steve.dower at microsoft.com>
date: Fri Sep 09 16:37:53 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
@@ -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 --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
@@ -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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list