diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-10 18:18:38 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-11 20:24:18 -0600 |
| commit | af68033509730ffe01602f839861a47287bb709f (patch) | |
| tree | 2960f6cdd023e74a4ca2bbc49d0294b7bfbed5c5 /src/engine/dependency.cpp | |
| parent | 10ef9d5bfbf81f454113a1c2716009831a916222 (diff) | |
| download | wix-af68033509730ffe01602f839861a47287bb709f.tar.gz wix-af68033509730ffe01602f839861a47287bb709f.tar.bz2 wix-af68033509730ffe01602f839861a47287bb709f.zip | |
Handle when related bundles have an uninstall key but aren't cached.
#4991
Diffstat (limited to 'src/engine/dependency.cpp')
| -rw-r--r-- | src/engine/dependency.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/dependency.cpp b/src/engine/dependency.cpp index 9ab76551..51aca239 100644 --- a/src/engine/dependency.cpp +++ b/src/engine/dependency.cpp | |||
| @@ -260,7 +260,13 @@ extern "C" HRESULT DependencyDetect( | |||
| 260 | 260 | ||
| 261 | for (DWORD iRelatedBundle = 0; iRelatedBundle < pEngineState->registration.relatedBundles.cRelatedBundles; ++iRelatedBundle) | 261 | for (DWORD iRelatedBundle = 0; iRelatedBundle < pEngineState->registration.relatedBundles.cRelatedBundles; ++iRelatedBundle) |
| 262 | { | 262 | { |
| 263 | pPackage = &pEngineState->registration.relatedBundles.rgRelatedBundles[iRelatedBundle].package; | 263 | BURN_RELATED_BUNDLE* pRelatedBundle = pEngineState->registration.relatedBundles.rgRelatedBundles + iRelatedBundle; |
| 264 | if (!pRelatedBundle->fPlannable) | ||
| 265 | { | ||
| 266 | continue; | ||
| 267 | } | ||
| 268 | |||
| 269 | pPackage = &pRelatedBundle->package; | ||
| 264 | hr = DetectPackageDependents(pPackage, sdIgnoredDependents, pRegistration); | 270 | hr = DetectPackageDependents(pPackage, sdIgnoredDependents, pRegistration); |
| 265 | ExitOnFailure(hr, "Failed to detect dependents for related bundle '%ls'", pPackage->sczId); | 271 | ExitOnFailure(hr, "Failed to detect dependents for related bundle '%ls'", pPackage->sczId); |
| 266 | } | 272 | } |
