summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_api
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-12-12 11:09:36 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2023-12-12 11:56:35 +0100
commit65d35006de65e540355833a56bcaa7659f6f1afd (patch)
treeffa01f0b613cf8f0cf9d0ead23399bcc89ab1f28 /src/buildtool/execution_api
parenta1bdc438f3e17b0c30f3a53b0bc5e38ebb7bb936 (diff)
downloadjustbuild-65d35006de65e540355833a56bcaa7659f6f1afd.tar.gz
Filesystem: Fix copy overwrite of symlink with file
... and improve log messages in case of failure.
Diffstat (limited to 'src/buildtool/execution_api')
-rw-r--r--src/buildtool/execution_api/git/git_api.hpp3
-rw-r--r--src/buildtool/execution_api/local/local_api.hpp3
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_api.cpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp
index 52c21627..dcab8335 100644
--- a/src/buildtool/execution_api/git/git_api.hpp
+++ b/src/buildtool/execution_api/git/git_api.hpp
@@ -83,6 +83,9 @@ class GitApi final : public IExecutionApi {
not FileSystemManager::WriteFileAs</*kSetEpochTime=*/true,
/*kSetWritable=*/true>(
*blob, output_paths[i], info.type)) {
+ Logger::Log(LogLevel::Error,
+ "staging to output path {} failed.",
+ output_paths[i].string());
return false;
}
}
diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp
index d46be8ed..a5596350 100644
--- a/src/buildtool/execution_api/local/local_api.hpp
+++ b/src/buildtool/execution_api/local/local_api.hpp
@@ -114,6 +114,9 @@ class LocalApi final : public IExecutionApi {
/*kSetEpochTime=*/true,
/*kSetWritable=*/true>(
*blob_path, output_paths[i], info.type)) {
+ Logger::Log(LogLevel::Error,
+ "staging to output path {} failed.",
+ output_paths[i].string());
return false;
}
}
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index 3d1cf40e..7539771e 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -263,6 +263,9 @@ auto BazelApi::CreateAction(
if (not FileSystemManager::WriteFileAs</*kSetEpochTime=*/true,
/*kSetWritable=*/true>(
blobs[pos].data, output_paths[gpos], type)) {
+ Logger::Log(LogLevel::Error,
+ "staging to output path {} failed.",
+ output_paths[gpos].string());
return false;
}
}