diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-10 14:51:05 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-13 17:41:27 +0200 |
| commit | 1c06fd642f49e4e06bf015d515ce0fd2f80b57d2 (patch) | |
| tree | 2d8a4d1c733f709b7f49e1038f8aa687933fc0a0 /setup_native | |
| parent | ef61fd353973f502688e2b609aed7d0f2fc14eda (diff) | |
Improve logging of feature states
Change-Id: I8b304bbefe861abd7503204f0ae8efb0aea203ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86528
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2bb064943444cd5bac155ad367378b674bceb11a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86545
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx index 250a81bd0fa0..c2840eeccaf1 100644 --- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx +++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx @@ -236,12 +236,21 @@ extern "C" __declspec(dllexport) UINT __stdcall PrepRegUnregDLLs(MSIHANDLE hInst CheckWin32Error("MsiGetFeatureStateW", MsiGetFeatureStateW(hInstall, L"gm_SharePointSupport_SubstMSO", ¤t_state_SubstMSO, &future_state_SubstMSO)); + + WriteLog(hInstall, "gm_SharePointSupport_SubstMSO state:", // + "current", std::to_string(current_state_SubstMSO), // + "future", std::to_string(future_state_SubstMSO)); // + INSTALLSTATE current_state_Main; INSTALLSTATE future_state_Main; CheckWin32Error("MsiGetFeatureStateW", MsiGetFeatureStateW(hInstall, L"gm_o_SharePointSupport", ¤t_state_Main, &future_state_Main)); + WriteLog(hInstall, "gm_o_SharePointSupport state:", // + "current", std::to_string(current_state_Main), // + "future", std::to_string(future_state_Main)); // + const bool bUnregSubstMSO = current_state_SubstMSO == INSTALLSTATE_LOCAL && future_state_SubstMSO == INSTALLSTATE_ABSENT; const bool bUnregMain |