diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-02-10 18:09:34 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-02-10 19:51:19 -0600 |
commit | 27a0db4070a2b5756282bf15b957dd7f0021417f (patch) | |
tree | 2d0cdfe80d5ccd6d207bdf664a4f8e512281c1cf /src/burn/engine/core.cpp | |
parent | 091573d459d6ab4947bd39bd3bc8faee3d18b4fc (diff) | |
download | wix-27a0db4070a2b5756282bf15b957dd7f0021417f.tar.gz wix-27a0db4070a2b5756282bf15b957dd7f0021417f.tar.bz2 wix-27a0db4070a2b5756282bf15b957dd7f0021417f.zip |
When rolling back a bundle failure, reinstall all upgrade related bundles.
Fixes #3421
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 7f7a915e..8fac7bd0 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -558,7 +558,7 @@ extern "C" HRESULT CorePlan( | |||
558 | ExitOnFailure(hr, "Failed to plan packages."); | 558 | ExitOnFailure(hr, "Failed to plan packages."); |
559 | 559 | ||
560 | // Schedule the update of related bundles last. | 560 | // Schedule the update of related bundles last. |
561 | hr = PlanRelatedBundlesComplete(&pEngineState->registration, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, dwExecuteActionEarlyIndex); | 561 | hr = PlanRelatedBundlesComplete(&pEngineState->userExperience, &pEngineState->registration, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, dwExecuteActionEarlyIndex); |
562 | ExitOnFailure(hr, "Failed to schedule related bundles."); | 562 | ExitOnFailure(hr, "Failed to schedule related bundles."); |
563 | } | 563 | } |
564 | } | 564 | } |
@@ -2309,7 +2309,7 @@ static void LogRelatedBundles( | |||
2309 | 2309 | ||
2310 | if (pRelatedBundle->fPlannable) | 2310 | if (pRelatedBundle->fPlannable) |
2311 | { | 2311 | { |
2312 | LogId(REPORT_STANDARD, MSG_PLANNED_RELATED_BUNDLE, pPackage->sczId, LoggingRelationTypeToString(pRelatedBundle->relationType), LoggingRequestStateToString(pPackage->defaultRequested), LoggingRequestStateToString(pPackage->requested), LoggingActionStateToString(pPackage->execute), LoggingActionStateToString(pPackage->rollback), LoggingDependencyActionToString(pPackage->dependencyExecute)); | 2312 | LogId(REPORT_STANDARD, MSG_PLANNED_RELATED_BUNDLE, pPackage->sczId, LoggingRelationTypeToString(pRelatedBundle->relationType), LoggingRequestStateToString(pPackage->defaultRequested), LoggingRequestStateToString(pPackage->requested), LoggingActionStateToString(pPackage->execute), LoggingActionStateToString(pPackage->rollback), LoggingRequestStateToString(pRelatedBundle->defaultRequestedRestore), LoggingRequestStateToString(pRelatedBundle->requestedRestore), LoggingActionStateToString(pRelatedBundle->restore), LoggingDependencyActionToString(pPackage->dependencyExecute)); |
2313 | } | 2313 | } |
2314 | } | 2314 | } |
2315 | } | 2315 | } |