Allow BundlePackage to fallback to QuietUninstallString to uninstall.

Partial implementation of 6756

1 files changed, 8 insertions, 4 deletions

diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index 18f9b274..5c9ebe08 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -2805,13 +2805,16 @@ static BURN_CACHE_PACKAGE_TYPE GetCachePackageType(
     case BOOTSTRAPPER_ACTION_STATE_NONE:
         break;
     case BOOTSTRAPPER_ACTION_STATE_UNINSTALL:
-        if (BURN_PACKAGE_TYPE_BUNDLE == pPackage->type ||
-            BURN_PACKAGE_TYPE_EXE == pPackage->type && BURN_EXE_DETECTION_TYPE_ARP != pPackage->Exe.detectionType)
+        if (BURN_PACKAGE_TYPE_EXE == pPackage->type && BURN_EXE_DETECTION_TYPE_ARP != pPackage->Exe.detectionType)
         {
-            // Bundle and non-ArpEntry Exe packages require the package for all operations (even uninstall).
-            // TODO: bundles could theoretically use package cache.
+            // non-ArpEntry Exe packages require the package for all operations (even uninstall).
             cachePackageType = BURN_CACHE_PACKAGE_TYPE_REQUIRED;
         }
+        else if (BURN_PACKAGE_TYPE_BUNDLE == pPackage->type)
+        {
+            // Bundle packages prefer the cache but can fallback to the ARP registration.
+            cachePackageType = BURN_CACHE_PACKAGE_TYPE_OPTIONAL;
+        }
         else
         {
             // The other package types can uninstall without the original package.
@@ -2823,6 +2826,7 @@ static BURN_CACHE_PACKAGE_TYPE GetCachePackageType(
     case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
     default:
+        // TODO: bundles could theoretically use package cache.
         cachePackageType = BURN_CACHE_PACKAGE_TYPE_REQUIRED;
         break;
     }