diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-04 17:55:17 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-05 16:22:04 -0600 |
commit | e027c6c571a4bc8c818244e2b0c5015eb4ef3110 (patch) | |
tree | 8149aa491766bfe8a883f921831a52133abceea5 /src/burn/engine/plan.cpp | |
parent | baf09c19c5a0f0d3f9533f9084f094066c1be7d9 (diff) | |
download | wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.gz wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.bz2 wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.zip |
Change ARP property Installed to 0 when registrationType is InProgress.
Being registered in ARP and "installed" were always separate concepts, and some things like fEligibleForCleanup were looking at the wrong thing. This also allows the BA to tell the difference.
Diffstat (limited to 'src/burn/engine/plan.cpp')
-rw-r--r-- | src/burn/engine/plan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp index 49dd83f4..c9337df5 100644 --- a/src/burn/engine/plan.cpp +++ b/src/burn/engine/plan.cpp | |||
@@ -1692,7 +1692,7 @@ extern "C" HRESULT PlanExecuteCacheSyncAndRollback( | |||
1692 | HRESULT hr = S_OK; | 1692 | HRESULT hr = S_OK; |
1693 | BURN_EXECUTE_ACTION* pAction = NULL; | 1693 | BURN_EXECUTE_ACTION* pAction = NULL; |
1694 | 1694 | ||
1695 | if (!pPlan->fBundleAlreadyRegistered) | 1695 | if (pPlan->fPlanPackageCacheRollback) |
1696 | { | 1696 | { |
1697 | hr = PlanAppendRollbackAction(pPlan, &pAction); | 1697 | hr = PlanAppendRollbackAction(pPlan, &pAction); |
1698 | ExitOnFailure(hr, "Failed to append rollback action."); | 1698 | ExitOnFailure(hr, "Failed to append rollback action."); |
@@ -2241,7 +2241,7 @@ static HRESULT AddCachePackageHelper( | |||
2241 | pCacheAction->type = BURN_CACHE_ACTION_TYPE_CHECKPOINT; | 2241 | pCacheAction->type = BURN_CACHE_ACTION_TYPE_CHECKPOINT; |
2242 | pCacheAction->checkpoint.dwId = dwCheckpoint; | 2242 | pCacheAction->checkpoint.dwId = dwCheckpoint; |
2243 | 2243 | ||
2244 | if (!pPlan->fBundleAlreadyRegistered) | 2244 | if (pPlan->fPlanPackageCacheRollback) |
2245 | { | 2245 | { |
2246 | // Create a package cache rollback action *before* the checkpoint. | 2246 | // Create a package cache rollback action *before* the checkpoint. |
2247 | hr = AppendRollbackCacheAction(pPlan, &pCacheAction); | 2247 | hr = AppendRollbackCacheAction(pPlan, &pCacheAction); |