diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-31 17:06:35 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-08-09 10:33:49 -0600 |
commit | d21eed76c48960707561c45c492c10a6a23c052e (patch) | |
tree | ebab09d099a699a24801fcfb4d7152cf82cc4a06 /src/engine/mspengine.cpp | |
parent | ad80d6dc10f9bd6cb6a084857a8fb546cc55e756 (diff) | |
download | wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.gz wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.bz2 wix-d21eed76c48960707561c45c492c10a6a23c052e.zip |
WIXFEAT:4763 Change "string" variable type to literal and add "formatted".
Diffstat (limited to 'src/engine/mspengine.cpp')
-rw-r--r-- | src/engine/mspengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp index 57321d75..0854862b 100644 --- a/src/engine/mspengine.cpp +++ b/src/engine/mspengine.cpp | |||
@@ -488,7 +488,7 @@ extern "C" HRESULT MspEngineExecutePackage( | |||
488 | 488 | ||
489 | // TODO: Figure out if this makes sense -- the variable is set to the last patch's path only | 489 | // TODO: Figure out if this makes sense -- the variable is set to the last patch's path only |
490 | // Best effort to set the execute package cache folder variable. | 490 | // Best effort to set the execute package cache folder variable. |
491 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE); | 491 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE, FALSE); |
492 | 492 | ||
493 | hr = PathConcat(sczCachedDirectory, pMspPackage->rgPayloads[0].pPayload->sczFilePath, &sczMspPath); | 493 | hr = PathConcat(sczCachedDirectory, pMspPackage->rgPayloads[0].pPayload->sczFilePath, &sczMspPath); |
494 | ExitOnFailure(hr, "Failed to build MSP path."); | 494 | ExitOnFailure(hr, "Failed to build MSP path."); |
@@ -609,8 +609,8 @@ LExit: | |||
609 | } | 609 | } |
610 | 610 | ||
611 | // Best effort to clear the execute package cache folder and action variables. | 611 | // Best effort to clear the execute package cache folder and action variables. |
612 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, NULL, TRUE); | 612 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, NULL, TRUE, FALSE); |
613 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_ACTION, NULL, TRUE); | 613 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_ACTION, NULL, TRUE, FALSE); |
614 | 614 | ||
615 | return hr; | 615 | return hr; |
616 | } | 616 | } |