Ignore cache bundle failure if it already exists in the package cache.

Fixes 6848

2 files changed, 12 insertions, 7 deletions

diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp
index 01237162..251cd24b 100644
--- a/src/burn/engine/cache.cpp
+++ b/src/burn/engine/cache.cpp
@@ -1000,8 +1000,6 @@ extern "C" HRESULT CacheCompleteBundle(
     BOOL fPathEqual = FALSE;
     LPWSTR sczTargetDirectory = NULL;
     LPWSTR sczTargetPath = NULL;
-    LPWSTR sczSourceDirectory = NULL;
-    LPWSTR sczPayloadSourcePath = NULL;
 
     hr = CreateCompletedPath(pCache, fPerMachine, wzBundleId, NULL, &sczTargetDirectory);
     ExitOnFailure(hr, "Failed to create completed cache path for bundle.");
@@ -1028,18 +1026,18 @@ extern "C" HRESULT CacheCompleteBundle(
     FileRemoveFromPendingRename(sczTargetPath); // best effort to ensure bundle is not deleted from cache post restart.
 
     hr = FileEnsureCopyWithRetry(wzSourceBundlePath, sczTargetPath, TRUE, FILE_OPERATION_RETRY_COUNT, FILE_OPERATION_RETRY_WAIT);
+    if (FAILED(hr) && FileExistsEx(sczTargetPath, NULL))
+    {
+        LogId(REPORT_WARNING, MSG_IGNORING_CACHE_BUNDLE_FAILURE, hr);
+        ExitFunction1(hr = S_OK);
+    }
     ExitOnFailure(hr, "Failed to cache bundle from: '%ls' to '%ls'", wzSourceBundlePath, sczTargetPath);
 
     // Reset the path permissions in the cache.
     hr = ResetPathPermissions(fPerMachine, sczTargetPath);
     ExitOnFailure(hr, "Failed to reset permissions on cached bundle: '%ls'", sczTargetPath);
 
-    hr = PathGetDirectory(wzSourceBundlePath, &sczSourceDirectory);
-    ExitOnFailure(hr, "Failed to get directory from engine working path: %ls", wzSourceBundlePath);
-
 LExit:
-    ReleaseStr(sczPayloadSourcePath);
-    ReleaseStr(sczSourceDirectory);
     ReleaseStr(sczTargetPath);
     ReleaseStr(sczTargetDirectory);
 
diff --git a/src/burn/engine/engine.mc b/src/burn/engine/engine.mc
index cebd1325..39aea60e 100644
--- a/src/burn/engine/engine.mc
+++ b/src/burn/engine/engine.mc
@@ -862,6 +862,13 @@ Language=English
 Cached non-vital package: %1!ls!, encountered error: 0x%2!x!. Continuing...
 .
 
+MessageId=345
+Severity=Warning
+SymbolicName=MSG_IGNORING_CACHE_BUNDLE_FAILURE
+Language=English
+Ignoring failure to cache bundle because the file already exists, encountered error: 0x%1!x!. Continuing...
+.
+
 MessageId=346
 Severity=Warning
 SymbolicName=MSG_CACHE_RETRYING_PACKAGE