From: 6d5CfLQ3dYAb <6d5CfLQ3dYAb@users.noreply.github.com>
Date: Sat, 26 Mar 2022 08:55:40 +0000 (-0700)
Subject: fix: Don't exit with error on read failure from cached file (#1036)
X-Git-Tag: v4.6.1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3543fdbe4b6e6c4e182a5d3e063d3eaf8ae8e94e;p=thirdparty%2Fccache.git

fix: Don't exit with error on read failure from cached file (#1036)
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index a3dade4ca..2105ab84e 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1862,14 +1862,14 @@ from_cache(Context& ctx, FromCacheCallMode mode, const Digest& result_key)
     return false;
   }
 
-  File file(*result_path, "rb");
-  core::FileReader file_reader(file.get());
-  core::CacheEntryReader cache_entry_reader(file_reader);
-  Result::Reader result_reader(cache_entry_reader, *result_path);
-  ResultRetriever result_retriever(
-    ctx, should_rewrite_dependency_target(ctx.args_info));
-
   try {
+    File file(*result_path, "rb");
+    core::FileReader file_reader(file.get());
+    core::CacheEntryReader cache_entry_reader(file_reader);
+    Result::Reader result_reader(cache_entry_reader, *result_path);
+    ResultRetriever result_retriever(
+      ctx, should_rewrite_dependency_target(ctx.args_info));
+
     result_reader.read(result_retriever);
   } catch (core::Error& e) {
     LOG("Failed to get result from cache: {}", e.what());