aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/msiengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-04 19:25:07 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commit27c6decae94536cae338731b6cb765aa92776486 (patch)
treecabfb05464fdc64e30597da28a54113fc3a62da1 /src/burn/engine/msiengine.cpp
parenta2f2036c8598efcb434eebeeacd7ede84ab60dfe (diff)
downloadwix-27c6decae94536cae338731b6cb765aa92776486.tar.gz
wix-27c6decae94536cae338731b6cb765aa92776486.tar.bz2
wix-27c6decae94536cae338731b6cb765aa92776486.zip
Put back the rollback cache package functionality and fix its bugs.
#3719, #4711, #5750
Diffstat (limited to 'src/burn/engine/msiengine.cpp')
-rw-r--r--src/burn/engine/msiengine.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index 3e96e5f9..a579fa17 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -915,8 +915,7 @@ extern "C" HRESULT MsiEnginePlanAddPackage(
915 __in BURN_PACKAGE* pPackage, 915 __in BURN_PACKAGE* pPackage,
916 __in BURN_PLAN* pPlan, 916 __in BURN_PLAN* pPlan,
917 __in BURN_LOGGING* pLog, 917 __in BURN_LOGGING* pLog,
918 __in BURN_VARIABLES* pVariables, 918 __in BURN_VARIABLES* pVariables
919 __in_opt HANDLE hCacheEvent
920 ) 919 )
921{ 920{
922 HRESULT hr = S_OK; 921 HRESULT hr = S_OK;
@@ -943,13 +942,6 @@ extern "C" HRESULT MsiEnginePlanAddPackage(
943 } 942 }
944 } 943 }
945 944
946 // add wait for cache
947 if (hCacheEvent)
948 {
949 hr = PlanExecuteCacheSyncAndRollback(pPlan, pPackage, hCacheEvent);
950 ExitOnFailure(hr, "Failed to plan package cache syncpoint");
951 }
952
953 hr = DependencyPlanPackage(NULL, pPackage, pPlan); 945 hr = DependencyPlanPackage(NULL, pPackage, pPlan);
954 ExitOnFailure(hr, "Failed to plan package dependency actions."); 946 ExitOnFailure(hr, "Failed to plan package dependency actions.");
955 947