summaryrefslogtreecommitdiff
path: root/src/buildtool/file_system/file_system_manager.hpp
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/file_system/file_system_manager.hpp
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/file_system/file_system_manager.hpp')
-rw-r--r--src/buildtool/file_system/file_system_manager.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp
index 181cba27..71b319d1 100644
--- a/src/buildtool/file_system/file_system_manager.hpp
+++ b/src/buildtool/file_system/file_system_manager.hpp
@@ -1013,9 +1013,8 @@ class FileSystemManager {
std::filesystem::copy_options::overwrite_existing) noexcept
-> bool {
try {
- // src and dst should be actual files
- if (std::filesystem::is_symlink(src) or
- std::filesystem::is_symlink(dst)) {
+ // src should be an actual file
+ if (std::filesystem::is_symlink(src)) {
return false;
}
if (not RemoveFile(dst)) {