aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/pseudobundle.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-08-03 15:42:08 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-08-04 10:03:57 -0500
commit94b8260fc5c1abc199f8d6145f3db4e2de490463 (patch)
treef8aeebc5b8d3facdab8232f60098ed253b3019cf /src/burn/engine/pseudobundle.cpp
parent9ae1c04d5fa02ac020885cdad7c592f7bb43d83e (diff)
downloadwix-94b8260fc5c1abc199f8d6145f3db4e2de490463.tar.gz
wix-94b8260fc5c1abc199f8d6145f3db4e2de490463.tar.bz2
wix-94b8260fc5c1abc199f8d6145f3db4e2de490463.zip
Recreate the command line for the clean room process.
Persist /xlog when resuming from RunOnce. Fixes #6259
Diffstat (limited to 'src/burn/engine/pseudobundle.cpp')
-rw-r--r--src/burn/engine/pseudobundle.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/burn/engine/pseudobundle.cpp b/src/burn/engine/pseudobundle.cpp
index 00007247..52b7bd8a 100644
--- a/src/burn/engine/pseudobundle.cpp
+++ b/src/burn/engine/pseudobundle.cpp
@@ -165,7 +165,6 @@ extern "C" HRESULT PseudoBundleInitializePassthrough(
165 __in BURN_PACKAGE* pPassthroughPackage, 165 __in BURN_PACKAGE* pPassthroughPackage,
166 __in BURN_ENGINE_COMMAND* pInternalCommand, 166 __in BURN_ENGINE_COMMAND* pInternalCommand,
167 __in BOOTSTRAPPER_COMMAND* pCommand, 167 __in BOOTSTRAPPER_COMMAND* pCommand,
168 __in_z_opt LPCWSTR wzAppendLogPath,
169 __in BURN_PACKAGE* pPackage 168 __in BURN_PACKAGE* pPackage
170 ) 169 )
171{ 170{
@@ -202,10 +201,8 @@ extern "C" HRESULT PseudoBundleInitializePassthrough(
202 201
203 pPassthroughPackage->Exe.protocol = pPackage->Exe.protocol; 202 pPassthroughPackage->Exe.protocol = pPackage->Exe.protocol;
204 203
205 // No matter the operation, we're passing the same command-line. That's what makes 204 hr = CoreCreatePassthroughBundleCommandLine(&sczArguments, pInternalCommand, pCommand);
206 // this a passthrough bundle. 205 ExitOnFailure(hr, "Failed to create command-line arguments.");
207 hr = CoreRecreateCommandLine(&sczArguments, pCommand->action, pInternalCommand, pCommand, pCommand->relationType, TRUE, wzAppendLogPath);
208 ExitOnFailure(hr, "Failed to recreate command-line arguments.");
209 206
210 hr = StrAllocString(&pPassthroughPackage->Exe.sczInstallArguments, sczArguments, 0); 207 hr = StrAllocString(&pPassthroughPackage->Exe.sczInstallArguments, sczArguments, 0);
211 ExitOnFailure(hr, "Failed to copy install arguments for passthrough bundle package"); 208 ExitOnFailure(hr, "Failed to copy install arguments for passthrough bundle package");