From d88898daad7dc654278e3709cf30ead1e4d6c870 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Tue, 13 Feb 2024 11:18:36 +0100 Subject: local_api: also for retrieve to memory, consult git api as fallback --- src/buildtool/execution_api/local/local_api.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/buildtool/execution_api/local/local_api.hpp') diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index dfe8be21..1e3de092 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -262,14 +262,15 @@ class LocalApi final : public IExecutionApi { location = storage_->CAS().BlobPath( artifact_info.digest, IsExecutableObject(artifact_info.type)); } - if (not location) { - return std::nullopt; + std::optional content = std::nullopt; + if (location) { + content = FileSystemManager::ReadFile(*location); } - auto const content = FileSystemManager::ReadFile(*location); - if (not content) { - return std::nullopt; + if ((not content) and repo_config_) { + content = + GitApi(repo_config_.value()).RetrieveToMemory(artifact_info); } - return *content; + return content; } [[nodiscard]] auto Upload(BlobContainer const& blobs, -- cgit v1.2.3