aboutsummaryrefslogtreecommitdiff
path: root/src/engine/apply.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-02-04 20:18:02 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-02-04 22:16:10 -0600
commitc5b9c47a26ca4e9d4eea63b7219b4d34938a5f1a (patch)
tree1c031f6bea38cad0fa88af7bf7b89caf1b1a3ba8 /src/engine/apply.cpp
parentdc992c49f30e0d2b912a6449a33b4448ef862f31 (diff)
downloadwix-c5b9c47a26ca4e9d4eea63b7219b4d34938a5f1a.tar.gz
wix-c5b9c47a26ca4e9d4eea63b7219b4d34938a5f1a.tar.bz2
wix-c5b9c47a26ca4e9d4eea63b7219b4d34938a5f1a.zip
Finalize MSP package registration states before logging them.
Diffstat (limited to '')
-rw-r--r--src/engine/apply.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index 8d2f5757..7c47ba75 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -885,6 +885,11 @@ static void CalculateKeepRegistration(
885 { 885 {
886 BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i; 886 BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i;
887 887
888 if (BURN_PACKAGE_TYPE_MSP == pPackage->type)
889 {
890 MspEngineFinalizeInstallRegistrationState(pPackage);
891 }
892
888 LogId(REPORT_STANDARD, MSG_POST_APPLY_PACKAGE, pPackage->sczId, LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState)); 893 LogId(REPORT_STANDARD, MSG_POST_APPLY_PACKAGE, pPackage->sczId, LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState));
889 894
890 if (!pPackage->fCanAffectRegistration) 895 if (!pPackage->fCanAffectRegistration)
@@ -892,11 +897,6 @@ static void CalculateKeepRegistration(
892 continue; 897 continue;
893 } 898 }
894 899
895 if (BURN_PACKAGE_TYPE_MSP == pPackage->type)
896 {
897 MspEngineFinalizeInstallRegistrationState(pPackage);
898 }
899
900 if (BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->installRegistrationState || 900 if (BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->installRegistrationState ||
901 BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->cacheRegistrationState) 901 BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->cacheRegistrationState)
902 { 902 {