From 01a0ed081f8eb6f7c41cd1052b146813fb94f699 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Tue, 20 Jun 2023 17:26:30 +0200 Subject: FileRoot: Add handling of non-upwards symlink... ...and update tests accordingly. --- src/buildtool/execution_engine/executor/executor.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/buildtool/execution_engine/executor/executor.hpp') diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp index d262eac5..32a8cc2c 100644 --- a/src/buildtool/execution_engine/executor/executor.hpp +++ b/src/buildtool/execution_engine/executor/executor.hpp @@ -394,11 +394,11 @@ class ExecutorImpl { if (ws_root == nullptr) { return std::nullopt; } - auto const object_type = ws_root->FileType(file_path); + auto const object_type = ws_root->BlobType(file_path); if (not object_type) { return std::nullopt; } - auto content = ws_root->ReadFile(file_path); + auto content = ws_root->ReadContent(file_path); if (not content.has_value()) { return std::nullopt; } -- cgit v1.2.3