From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 8 Oct 2015 16:55:49 +0000 (-0700)
Subject: Issue #25089: Adds logging to installer for case where launcher is not selected on... 
X-Git-Tag: v3.5.1rc1~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ae56919ab46e07e9bd6e5530cddac75e0276505;p=thirdparty%2FPython%2Fcpython.git

Issue #25089: Adds logging to installer for case where launcher is not selected on upgrade.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index cfa15415d2d4..410caa29e02d 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 99884e4c9aa9..bc418e0014f9 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;