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/apply.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/apply.cpp')
| -rw-r--r-- | src/burn/engine/apply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp index 68aded71..b7a54246 100644 --- a/src/burn/engine/apply.cpp +++ b/src/burn/engine/apply.cpp | |||
| @@ -2761,7 +2761,7 @@ static HRESULT ExecuteRelatedBundle( | |||
| 2761 | } | 2761 | } |
| 2762 | else | 2762 | else |
| 2763 | { | 2763 | { |
| 2764 | hrExecute = BundlePackageEngineExecuteRelatedBundle(pExecuteAction, pContext->pCache, &pEngineState->variables, fRollback, GenericExecuteMessageHandler, pContext, pRestart); | 2764 | hrExecute = BundlePackageEngineExecuteRelatedBundle(pExecuteAction, pContext->pCache, &pEngineState->variables, fRollback, FALSE/*fPerMachine*/, GenericExecuteMessageHandler, pContext, pRestart); |
| 2765 | ExitOnFailure(hrExecute, "Failed to configure per-user related bundle."); | 2765 | ExitOnFailure(hrExecute, "Failed to configure per-user related bundle."); |
| 2766 | } | 2766 | } |
| 2767 | 2767 | ||
| @@ -2888,7 +2888,7 @@ static HRESULT ExecuteBundlePackage( | |||
| 2888 | } | 2888 | } |
| 2889 | else | 2889 | else |
| 2890 | { | 2890 | { |
| 2891 | hrExecute = BundlePackageEngineExecutePackage(pExecuteAction, pContext->pCache, &pEngineState->variables, fRollback, SUCCEEDED(pExecuteAction->bundlePackage.pPackage->hrCacheResult), GenericExecuteMessageHandler, pContext, pRestart); | 2891 | hrExecute = BundlePackageEngineExecutePackage(pExecuteAction, pContext->pCache, &pEngineState->variables, fRollback, SUCCEEDED(pExecuteAction->bundlePackage.pPackage->hrCacheResult), pEngineState->registration.fPerMachine, GenericExecuteMessageHandler, pContext, pRestart); |
| 2892 | ExitOnFailure(hrExecute, "Failed to configure per-user BUNDLE package."); | 2892 | ExitOnFailure(hrExecute, "Failed to configure per-user BUNDLE package."); |
| 2893 | } | 2893 | } |
| 2894 | 2894 | ||
