From 5ae56919ab46e07e9bd6e5530cddac75e0276505 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Thu, 8 Oct 2015 09:55:49 -0700 Subject: Issue #25089: Adds logging to installer for case where launcher is not selected on upgrade. --- Misc/NEWS | 3 +++ Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index cfa1541..410caa2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -297,6 +297,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; -- cgit v0.12