From aa248f2b97dcbba075d4cac98e43587b13a3aa56 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sun, 2 Mar 2025 07:54:52 +0100 Subject: [PATCH] move: catch OSerror --- radicale/storage/multifilesystem/move.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/radicale/storage/multifilesystem/move.py b/radicale/storage/multifilesystem/move.py index 40224cbe..3eb5cee0 100644 --- a/radicale/storage/multifilesystem/move.py +++ b/radicale/storage/multifilesystem/move.py @@ -35,10 +35,12 @@ class StoragePartMove(StorageBase): assert isinstance(to_collection, multifilesystem.Collection) assert isinstance(item.collection, multifilesystem.Collection) assert item.href - os.replace(pathutils.path_to_filesystem( - item.collection._filesystem_path, item.href), - pathutils.path_to_filesystem( - to_collection._filesystem_path, to_href)) + move_from = pathutils.path_to_filesystem(item.collection._filesystem_path, item.href) + move_to = pathutils.path_to_filesystem(to_collection._filesystem_path, to_href) + try: + os.replace(move_from, move_to) + except OSError as e: + raise ValueError("Failed to move file %r => %r %s" % (move_from, move_to, e)) from e self._sync_directory(to_collection._filesystem_path) if item.collection._filesystem_path != to_collection._filesystem_path: self._sync_directory(item.collection._filesystem_path)