diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-14 20:48:01 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-16 10:30:28 -0600 |
commit | abe316b80fae80eba54b0b79e76b6362105fa098 (patch) | |
tree | 699290ccc7e924a5ef498e487924834c1018b80e /src/burn/engine/relatedbundle.cpp | |
parent | 47bca2dc51525fcad86f325278b14953ac5b137e (diff) | |
download | wix-abe316b80fae80eba54b0b79e76b6362105fa098.tar.gz wix-abe316b80fae80eba54b0b79e76b6362105fa098.tar.bz2 wix-abe316b80fae80eba54b0b79e76b6362105fa098.zip |
Refactor some dependency detection.
* Run DependencyDetect earlier
* Do package dependency checking during each package/related bundle
Diffstat (limited to 'src/burn/engine/relatedbundle.cpp')
-rw-r--r-- | src/burn/engine/relatedbundle.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp index 619fa8dd..3e0bc799 100644 --- a/src/burn/engine/relatedbundle.cpp +++ b/src/burn/engine/relatedbundle.cpp | |||
@@ -244,6 +244,9 @@ static HRESULT LoadIfRelatedBundle( | |||
244 | hr = LoadRelatedBundleFromKey(sczRelatedBundleId, hkBundleId, fPerMachine, relationType, pRelatedBundle); | 244 | hr = LoadRelatedBundleFromKey(sczRelatedBundleId, hkBundleId, fPerMachine, relationType, pRelatedBundle); |
245 | ExitOnFailure(hr, "Failed to initialize package from related bundle id: %ls", sczRelatedBundleId); | 245 | ExitOnFailure(hr, "Failed to initialize package from related bundle id: %ls", sczRelatedBundleId); |
246 | 246 | ||
247 | hr = DependencyDetectRelatedBundle(pRelatedBundle, pRegistration); | ||
248 | ExitOnFailure(hr, "Failed to detect dependencies for related bundle."); | ||
249 | |||
247 | ++pRelatedBundles->cRelatedBundles; | 250 | ++pRelatedBundles->cRelatedBundles; |
248 | } | 251 | } |
249 | 252 | ||