diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-25 19:43:09 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-02-25 20:21:23 -0500 |
| commit | 918332a0e80e8761eca20e801ae7ce3631fdbaea (patch) | |
| tree | c4b9ae147242c1e3830ba2f9443acfe0dcf20958 /src/burn/engine/elevation.cpp | |
| parent | 92714e7949c41db4c17e6bd87c919ef4b3dc34f7 (diff) | |
| download | wix-918332a0e80e8761eca20e801ae7ce3631fdbaea.tar.gz wix-918332a0e80e8761eca20e801ae7ce3631fdbaea.tar.bz2 wix-918332a0e80e8761eca20e801ae7ce3631fdbaea.zip | |
Handle scope of configurable-scope BundlePackages.
Fixes https://github.com/wixtoolset/issues/issues/9233
Diffstat (limited to 'src/burn/engine/elevation.cpp')
| -rw-r--r-- | src/burn/engine/elevation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp index 711ce4af..b13a5916 100644 --- a/src/burn/engine/elevation.cpp +++ b/src/burn/engine/elevation.cpp | |||
| @@ -2913,7 +2913,7 @@ static HRESULT OnExecuteRelatedBundle( | |||
| 2913 | } | 2913 | } |
| 2914 | 2914 | ||
| 2915 | // Execute related bundle. | 2915 | // Execute related bundle. |
| 2916 | hr = BundlePackageEngineExecuteRelatedBundle(&executeAction, pCache, pVariables, static_cast<BOOL>(dwRollback), GenericExecuteMessageHandler, hPipe, pRestart); | 2916 | hr = BundlePackageEngineExecuteRelatedBundle(&executeAction, pCache, pVariables, static_cast<BOOL>(dwRollback), TRUE/*fPerMachine*/, GenericExecuteMessageHandler, hPipe, pRestart); |
| 2917 | ExitOnFailure(hr, "Failed to execute related bundle."); | 2917 | ExitOnFailure(hr, "Failed to execute related bundle."); |
| 2918 | 2918 | ||
| 2919 | LExit: | 2919 | LExit: |
| @@ -3008,7 +3008,7 @@ static HRESULT OnExecuteBundlePackage( | |||
| 3008 | } | 3008 | } |
| 3009 | 3009 | ||
| 3010 | // Execute BUNDLE package. | 3010 | // Execute BUNDLE package. |
| 3011 | hr = BundlePackageEngineExecutePackage(&executeAction, pCache, pVariables, fRollback, fCacheAvailable, GenericExecuteMessageHandler, hPipe, pRestart); | 3011 | hr = BundlePackageEngineExecutePackage(&executeAction, pCache, pVariables, fRollback, fCacheAvailable, TRUE/*fPerMachine*/, GenericExecuteMessageHandler, hPipe, pRestart); |
| 3012 | ExitOnFailure(hr, "Failed to execute BUNDLE package."); | 3012 | ExitOnFailure(hr, "Failed to execute BUNDLE package."); |
| 3013 | 3013 | ||
| 3014 | LExit: | 3014 | LExit: |
