diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-15 20:02:53 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-15 20:06:52 -0600 |
| commit | 8701b06765803d1af0672df7cff533662990a82e (patch) | |
| tree | be1a7c698d77515b8cb9d20b735d1ed9ff6127ff /src/engine/plan.cpp | |
| parent | 6ac2cf5c3dc2df77ba8be2cf12c624e1c4a20e18 (diff) | |
| download | wix-8701b06765803d1af0672df7cff533662990a82e.tar.gz wix-8701b06765803d1af0672df7cff533662990a82e.tar.bz2 wix-8701b06765803d1af0672df7cff533662990a82e.zip | |
WIXBUG:4539 - Fix overall Cache action planning with related bundles.
Diffstat (limited to 'src/engine/plan.cpp')
| -rw-r--r-- | src/engine/plan.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp index 990ef554..ccb7b3ce 100644 --- a/src/engine/plan.cpp +++ b/src/engine/plan.cpp | |||
| @@ -1223,6 +1223,12 @@ extern "C" HRESULT PlanDefaultRelatedBundleRequestState( | |||
| 1223 | HRESULT hr = S_OK; | 1223 | HRESULT hr = S_OK; |
| 1224 | int nCompareResult = 0; | 1224 | int nCompareResult = 0; |
| 1225 | 1225 | ||
| 1226 | // Never touch related bundles during Cache. | ||
| 1227 | if (BOOTSTRAPPER_ACTION_CACHE == action) | ||
| 1228 | { | ||
| 1229 | ExitFunction1(*pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE); | ||
| 1230 | } | ||
| 1231 | |||
| 1226 | switch (relatedBundleRelationType) | 1232 | switch (relatedBundleRelationType) |
| 1227 | { | 1233 | { |
| 1228 | case BOOTSTRAPPER_RELATION_UPGRADE: | 1234 | case BOOTSTRAPPER_RELATION_UPGRADE: |