diff options
| -rw-r--r-- | src/buildtool/execution_api/execution_service/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/execution_api/execution_service/execution_server.cpp | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index 0b3fd9ef..a92bb2bd 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -33,7 +33,6 @@ , ["src/buildtool/logging", "log_level"] , ["src/buildtool/storage", "garbage_collector"] , ["src/utils/cpp", "hex_string"] - , ["src/utils/cpp", "path"] ] , "private-ldflags": ["-pthread", "-Wl,--whole-archive,-lpthread,--no-whole-archive"] diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp index 91c13d94..6f309021 100644 --- a/src/buildtool/execution_api/execution_service/execution_server.cpp +++ b/src/buildtool/execution_api/execution_service/execution_server.cpp @@ -44,7 +44,6 @@ #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/hex_string.hpp" -#include "src/utils/cpp/path.hpp" namespace { void SetTimeStamp( @@ -320,13 +319,7 @@ namespace { LocalCasReader reader(&storage.CAS()); if (ProtocolTraits::IsNative(storage.GetHashFunction().GetType())) { - // In native mode: Check validity of tree entries, otherwise set the - // digest directly. - if (not reader.ReadGitTree(digest)) { - auto const error = fmt::format( - "Found invalid entry in the Git Tree {}", digest.hash()); - return unexpected{error}; - } + // In native mode: set the digest directly. (*out_dir.mutable_tree_digest()) = ArtifactDigestFactory::ToBazel(digest); } @@ -373,13 +366,6 @@ namespace { "Failed to read the symlink content for {}", digest.hash())}; } - // in native mode, check that we do not pass invalid symlinks - if (ProtocolTraits::IsNative(storage.GetHashFunction().GetType()) and - not PathIsNonUpwards(*content)) { - auto const error = fmt::format("Invalid symlink for {}", digest.hash()); - return unexpected{error}; - } - *(out_link.mutable_target()) = *std::move(content); return out_link; } |