aboutsummaryrefslogtreecommitdiff
path: root/src/engine/mspengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-02-18 10:45:20 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-02-22 20:25:06 -0600
commit837f2e309c8ef0476668c342f612dfe1bb26cb87 (patch)
treef8a5fbef5e17e88b27a2a4cb6dc7a52f7cba4a5e /src/engine/mspengine.cpp
parentb29af5d005c2cc802aa60a123d435042038ba8ef (diff)
downloadwix-837f2e309c8ef0476668c342f612dfe1bb26cb87.tar.gz
wix-837f2e309c8ef0476668c342f612dfe1bb26cb87.tar.bz2
wix-837f2e309c8ef0476668c342f612dfe1bb26cb87.zip
Only the requested state and Cache=always should affect requestedCache.
Diffstat (limited to 'src/engine/mspengine.cpp')
-rw-r--r--src/engine/mspengine.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp
index f742ecef..81e85e4c 100644
--- a/src/engine/mspengine.cpp
+++ b/src/engine/mspengine.cpp
@@ -305,12 +305,10 @@ LExit:
305// 305//
306extern "C" HRESULT MspEnginePlanCalculatePackage( 306extern "C" HRESULT MspEnginePlanCalculatePackage(
307 __in BURN_PACKAGE* pPackage, 307 __in BURN_PACKAGE* pPackage,
308 __in BOOL fInsideMsiTransaction, 308 __in BOOL fInsideMsiTransaction
309 __out BOOL* pfBARequestedCache
310 ) 309 )
311{ 310{
312 HRESULT hr = S_OK; 311 HRESULT hr = S_OK;
313 BOOL fBARequestedCache = FALSE;
314 312
315 for (DWORD i = 0; i < pPackage->Msp.cTargetProductCodes; ++i) 313 for (DWORD i = 0; i < pPackage->Msp.cTargetProductCodes; ++i)
316 { 314 {
@@ -352,11 +350,6 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
352 execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; 350 execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
353 break; 351 break;
354 352
355 case BOOTSTRAPPER_REQUEST_STATE_CACHE:
356 execute = BOOTSTRAPPER_ACTION_STATE_NONE;
357 fBARequestedCache = TRUE;
358 break;
359
360 default: 353 default:
361 execute = BOOTSTRAPPER_ACTION_STATE_NONE; 354 execute = BOOTSTRAPPER_ACTION_STATE_NONE;
362 break; 355 break;
@@ -419,11 +412,6 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
419 } 412 }
420 } 413 }
421 414
422 if (pfBARequestedCache)
423 {
424 *pfBARequestedCache = fBARequestedCache;
425 }
426
427 return hr; 415 return hr;
428} 416}
429 417