aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/plan.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/burn/engine/plan.cpp')
-rw-r--r--src/burn/engine/plan.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index 47da22c0..68c1d2ba 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -1178,31 +1178,6 @@ extern "C" HRESULT PlanExecutePackage(
1178 pPackage->rollback = BOOTSTRAPPER_ACTION_STATE_NONE; 1178 pPackage->rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
1179 } 1179 }
1180 1180
1181 // Add the cache and install size to estimated size if it will be on the machine at the end of the install
1182 if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested ||
1183 fRequestedCache ||
1184 (BOOTSTRAPPER_PACKAGE_STATE_PRESENT == pPackage->currentState && BOOTSTRAPPER_REQUEST_STATE_ABSENT < pPackage->requested)
1185 )
1186 {
1187 // If the package will remain in the cache, add the package size to the estimated size
1188 if (BOOTSTRAPPER_CACHE_TYPE_REMOVE < pPackage->cacheType)
1189 {
1190 pPlan->qwEstimatedSize += pPackage->qwSize;
1191 }
1192
1193 // If the package will end up installed on the machine, add the install size to the estimated size.
1194 if (BOOTSTRAPPER_REQUEST_STATE_CACHE < pPackage->requested)
1195 {
1196 // MSP packages get cached automatically by windows installer with any embedded cabs, so include that in the size as well
1197 if (BURN_PACKAGE_TYPE_MSP == pPackage->type)
1198 {
1199 pPlan->qwEstimatedSize += pPackage->qwSize;
1200 }
1201
1202 pPlan->qwEstimatedSize += pPackage->qwInstallSize;
1203 }
1204 }
1205
1206 // Add execute actions. 1181 // Add execute actions.
1207 switch (pPackage->type) 1182 switch (pPackage->type)
1208 { 1183 {
@@ -3079,7 +3054,6 @@ extern "C" void PlanDump(
3079 LogStringLine(PlanDumpLevel, " disallow-removal: %hs", LoggingTrueFalseToString(pPlan->fDisallowRemoval)); 3054 LogStringLine(PlanDumpLevel, " disallow-removal: %hs", LoggingTrueFalseToString(pPlan->fDisallowRemoval));
3080 LogStringLine(PlanDumpLevel, " downgrade: %hs", LoggingTrueFalseToString(pPlan->fDowngrade)); 3055 LogStringLine(PlanDumpLevel, " downgrade: %hs", LoggingTrueFalseToString(pPlan->fDowngrade));
3081 LogStringLine(PlanDumpLevel, " registration options: %hs", LoggingRegistrationOptionsToString(pPlan->dwRegistrationOperations)); 3056 LogStringLine(PlanDumpLevel, " registration options: %hs", LoggingRegistrationOptionsToString(pPlan->dwRegistrationOperations));
3082 LogStringLine(PlanDumpLevel, " estimated size: %llu", pPlan->qwEstimatedSize);
3083 if (pPlan->sczLayoutDirectory) 3057 if (pPlan->sczLayoutDirectory)
3084 { 3058 {
3085 LogStringLine(PlanDumpLevel, " layout directory: %ls", pPlan->sczLayoutDirectory); 3059 LogStringLine(PlanDumpLevel, " layout directory: %ls", pPlan->sczLayoutDirectory);