Only the requested state and Cache=always should affect requestedCache.

1 files changed, 1 insertions, 23 deletions

diff --git a/src/engine/exeengine.cpp b/src/engine/exeengine.cpp
index f734edca..cee755e3 100644
--- a/src/engine/exeengine.cpp
+++ b/src/engine/exeengine.cpp
@@ -157,25 +157,12 @@ LExit:
 // PlanCalculate - calculates the execute and rollback state for the requested package state.
 //
 extern "C" HRESULT ExeEnginePlanCalculatePackage(
-    __in BURN_PACKAGE* pPackage,
-    __out_opt BOOL* pfBARequestedCache
+    __in BURN_PACKAGE* pPackage
     )
 {
     HRESULT hr = S_OK;
-    //BOOL fCondition = FALSE;
-    //BOOTSTRAPPER_PACKAGE_STATE expected = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN;
     BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE;
     BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
-    BOOL fBARequestedCache = FALSE;
-
-    //// evaluate rollback install condition
-    //if (pPackage->sczRollbackInstallCondition)
-    //{
-    //    hr = ConditionEvaluate(pVariables, pPackage->sczRollbackInstallCondition, &fCondition);
-    //    ExitOnFailure(hr, "Failed to evaluate rollback install condition.");
-
-    //    expected = fCondition ? BOOTSTRAPPER_PACKAGE_STATE_PRESENT : BOOTSTRAPPER_PACKAGE_STATE_ABSENT;
-    //}
 
     // execute action
     switch (pPackage->currentState)
@@ -209,10 +196,6 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
         case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
             execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
             break;
-        case BOOTSTRAPPER_REQUEST_STATE_CACHE:
-            execute = BOOTSTRAPPER_ACTION_STATE_NONE;
-            fBARequestedCache = TRUE;
-            break;
         default:
             execute = BOOTSTRAPPER_ACTION_STATE_NONE;
             break;
@@ -273,11 +256,6 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
     pPackage->execute = execute;
     pPackage->rollback = rollback;
 
-    if (pfBARequestedCache)
-    {
-        *pfBARequestedCache = fBARequestedCache;
-    }
-
 LExit:
     return hr;
 }