aboutsummaryrefslogtreecommitdiff
path: root/src/engine/core.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-04-28 16:43:48 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-04-29 14:05:34 -0500
commit752f0e0576dc27e937c553ed9dce5576bd388e95 (patch)
treef95013ccb3bdea206cf8879d6bbf2411a04663c6 /src/engine/core.cpp
parent7099dd38ab902e7fb92706314fa8710a34f165a5 (diff)
downloadwix-752f0e0576dc27e937c553ed9dce5576bd388e95.tar.gz
wix-752f0e0576dc27e937c553ed9dce5576bd388e95.tar.bz2
wix-752f0e0576dc27e937c553ed9dce5576bd388e95.zip
Let BA override the package's cache type during Plan.
Rename cache types to REMOVE, KEEP, FORCE. Change implementation of FORCE to not be through CACHED request state. Create package condition enum so BA can tell when InstallCondition wasn't specified. Tell BA when package is cached. Tell BA when package is planned to be cached and uncached.
Diffstat (limited to 'src/engine/core.cpp')
-rw-r--r--src/engine/core.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/engine/core.cpp b/src/engine/core.cpp
index a915dad0..535043af 100644
--- a/src/engine/core.cpp
+++ b/src/engine/core.cpp
@@ -1640,12 +1640,6 @@ static HRESULT DetectPackage(
1640 ExitOnRootFailure(hr, "Package type not supported by detect yet."); 1640 ExitOnRootFailure(hr, "Package type not supported by detect yet.");
1641 } 1641 }
1642 1642
1643 // TODO: consider how to notify the UX that a package is cached.
1644 //else if (BOOTSTRAPPER_PACKAGE_STATE_CACHED > pPackage->currentState && pPackage->fCached)
1645 //{
1646 // pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_CACHED;
1647 //}
1648
1649LExit: 1643LExit:
1650 if (FAILED(hr)) 1644 if (FAILED(hr))
1651 { 1645 {
@@ -1654,7 +1648,7 @@ LExit:
1654 1648
1655 if (fBegan) 1649 if (fBegan)
1656 { 1650 {
1657 UserExperienceOnDetectPackageComplete(&pEngineState->userExperience, pPackage->sczId, hr, pPackage->currentState); 1651 UserExperienceOnDetectPackageComplete(&pEngineState->userExperience, pPackage->sczId, hr, pPackage->currentState, pPackage->fCached);
1658 } 1652 }
1659 1653
1660 return hr; 1654 return hr;