[Python-checkins] cpython (3.5): Issue #25089: Adds logging to installer for case where launcher is not selected

[steve.dower]

https://hg.python.org/cpython/rev/1e99ba6b7c98
changeset:   98601:1e99ba6b7c98
branch:      3.5
parent:      98599:0b7df139a5f7
user:        Steve Dower <steve.dower at microsoft.com>
date:        Thu Oct 08 09:55:49 2015 -0700
summary:
  Issue #25089: Adds logging to installer for case where launcher is not selected on upgrade.

files:
  Misc/NEWS                                                    |  3 +++
  Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp |  7 +++++++
  2 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -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;

-- 
Repository URL: https://hg.python.org/cpython