aboutsummaryrefslogtreecommitdiff
path: root/src/engine/plan.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/engine/plan.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp
index 87607382..a4b8d0c1 100644
--- a/src/engine/plan.cpp
+++ b/src/engine/plan.cpp
@@ -1292,6 +1292,12 @@ extern "C" HRESULT PlanRelatedBundlesBegin(
1292 for (DWORD i = 0; i < pRegistration->relatedBundles.cRelatedBundles; ++i) 1292 for (DWORD i = 0; i < pRegistration->relatedBundles.cRelatedBundles; ++i)
1293 { 1293 {
1294 BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + i; 1294 BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + i;
1295
1296 if (!pRelatedBundle->fPlannable)
1297 {
1298 continue;
1299 }
1300
1295 pRelatedBundle->package.defaultRequested = BOOTSTRAPPER_REQUEST_STATE_NONE; 1301 pRelatedBundle->package.defaultRequested = BOOTSTRAPPER_REQUEST_STATE_NONE;
1296 pRelatedBundle->package.requested = BOOTSTRAPPER_REQUEST_STATE_NONE; 1302 pRelatedBundle->package.requested = BOOTSTRAPPER_REQUEST_STATE_NONE;
1297 1303
@@ -1417,6 +1423,11 @@ extern "C" HRESULT PlanRelatedBundlesComplete(
1417 DWORD *pdwInsertIndex = NULL; 1423 DWORD *pdwInsertIndex = NULL;
1418 BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + i; 1424 BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + i;
1419 1425
1426 if (!pRelatedBundle->fPlannable)
1427 {
1428 continue;
1429 }
1430
1420 // Do not execute if a major upgrade to the related bundle is an embedded bundle (Provider keys are the same) 1431 // Do not execute if a major upgrade to the related bundle is an embedded bundle (Provider keys are the same)
1421 if (0 < pRelatedBundle->package.cDependencyProviders) 1432 if (0 < pRelatedBundle->package.cDependencyProviders)
1422 { 1433 {