From 934cacdc8fc7c35c94d3b1eee6cc8ab5c8a8ce4d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 16 Jan 2022 10:59:40 -0600 Subject: Rename fUninstallable to fPermanent. Refactoring for #6459 --- src/burn/engine/msiengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/burn/engine/msiengine.cpp') diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp index 68582d29..9dd2312e 100644 --- a/src/burn/engine/msiengine.cpp +++ b/src/burn/engine/msiengine.cpp @@ -912,7 +912,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( } } else if ((BOOTSTRAPPER_REQUEST_STATE_ABSENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_CACHE == pPackage->requested) && - pPackage->fUninstallable) // removing a package that can be removed. + !pPackage->fPermanent) // removing a package that should be removed. { execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL; } @@ -973,9 +973,9 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( case BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE: __fallthrough; case BOOTSTRAPPER_PACKAGE_STATE_ABSENT: __fallthrough; - // If the package is uninstallable and we requested to put the package on the machine then + // If the package is not permanent and we requested to put the package on the machine then // remove the package during rollback. - if (pPackage->fUninstallable && + if (!pPackage->fPermanent && (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)) { -- cgit v1.2.3-55-g6feb