mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #25144: Ensures TargetDir is set before continuing with custom install.

Browse source
This commit is contained in:
Steve Dower 2016-09-09 16:37:53 -07:00
parent 87dc4d6189
commit c87ae806ab
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -275,6 +275,9 @@ Tools/Demos
Windows 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 - Issue #27469: Adds a shell extension to the launcher so that drag and drop
works correctly. works correctly.

3
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file

@ -327,6 +327,9 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
case ID_CUSTOM_INSTALL_BUTTON: case ID_CUSTOM_INSTALL_BUTTON:
SavePageSettings(); SavePageSettings();
hr = EnsureTargetDir();
ExitOnFailure(hr, L"Failed to set TargetDir");
hr = BalGetStringVariable(L"TargetDir", &targetDir); hr = BalGetStringVariable(L"TargetDir", &targetDir);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
// TODO: Check whether directory exists and contains another installation // TODO: Check whether directory exists and contains another installation