(original) (raw)

changeset: 98601:1e99ba6b7c98 branch: 3.5 parent: 98599:0b7df139a5f7 user: Steve Dower steve.dower@microsoft.com date: Thu Oct 08 09:55:49 2015 -0700 files: Misc/NEWS Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp description: Issue #25089: Adds logging to installer for case where launcher is not selected on upgrade. diff -r 0b7df139a5f7 -r 1e99ba6b7c98 Misc/NEWS --- a/Misc/NEWS Thu Oct 08 09:06:17 2015 -0700 +++ b/Misc/NEWS Thu Oct 08 09:55:49 2015 -0700 @@ -297,6 +297,9 @@ 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 -r 0b7df139a5f7 -r 1e99ba6b7c98 Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp Thu Oct 08 09:06:17 2015 -0700 +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp Thu Oct 08 09:55:49 2015 -0700 @@ -687,6 +687,13 @@ 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; /steve.dower@microsoft.com