diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-08 17:00:55 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-08 17:00:55 (GMT) |
| commit | 6e8d6ed2f4522c172c825441523dbd88fd1f4d62 (patch) | |
| tree | 92f050d40a609ac022814400948ba03f0084c016 | |
| parent | 666e6e1b4b7990c7095b1c37a742bcda585126d9 (diff) | |
| parent | 5ae56919ab46e07e9bd6e5530cddac75e0276505 (diff) | |
| download | cpython-6e8d6ed2f4522c172c825441523dbd88fd1f4d62.zip cpython-6e8d6ed2f4522c172c825441523dbd88fd1f4d62.tar.gz cpython-6e8d6ed2f4522c172c825441523dbd88fd1f4d62.tar.bz2 | |
Merge from 3.5
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -437,6 +437,9 @@ Build Windows ------- +- Issue #25089: Adds logging to installer for case where launcher is not + selected on upgrade. + - Issue #25165: Windows uninstallation should not remove launcher if other versions remain diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 99884e4..bc418e0 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -687,6 +687,13 @@ public: // IBootstrapperApplication if (hr == S_FALSE) { hr = LoadLauncherStateFromKey(_engine, HKEY_LOCAL_MACHINE); } + if (FAILED(hr)) { + BalLog( + BOOTSTRAPPER_LOG_LEVEL_ERROR, + "Failed to load launcher state: error code 0x%08X", + hr + ); + } } else if (BOOTSTRAPPER_RELATED_OPERATION_NONE == operation) { if (_command.action == BOOTSTRAPPER_ACTION_INSTALL) { LOC_STRING *pLocString = nullptr; |