diff --git a/src/borg/cache.py b/src/borg/cache.py index 282a2fc82..11ef36f69 100644 --- a/src/borg/cache.py +++ b/src/borg/cache.py @@ -25,7 +25,7 @@ from .helpers import yes, hostname_is_unique from .helpers import remove_surrogates from .helpers import ProgressIndicatorPercent, ProgressIndicatorMessage from .helpers import set_ec, EXIT_WARNING -from .helpers import truncate_and_unlink +from .helpers import safe_unlink from .helpers import msgpack from .item import ArchiveItem, ChunkListEntry from .crypto.key import PlaintextKey @@ -745,7 +745,7 @@ class LocalCache(CacheStatsMixin): filename=bin_to_hex(archive_id) + '.compact') as fd: chunk_idx.write(fd) except Exception: - truncate_and_unlink(fn_tmp) + safe_unlink(fn_tmp) else: os.rename(fn_tmp, fn) diff --git a/src/borg/helpers.py b/src/borg/helpers.py index 7fe9c274f..6b2e14c8d 100644 --- a/src/borg/helpers.py +++ b/src/borg/helpers.py @@ -2399,7 +2399,7 @@ def secure_erase(path): os.unlink(path) -def truncate_and_unlink(path): +def safe_unlink(path): """ Safely unlink (delete) *path*. diff --git a/src/borg/platform/base.py b/src/borg/platform/base.py index c0b990c9c..234b02426 100644 --- a/src/borg/platform/base.py +++ b/src/borg/platform/base.py @@ -3,7 +3,7 @@ import os import socket import uuid -from borg.helpers import truncate_and_unlink +from borg.helpers import safe_unlink """ platform base module @@ -168,7 +168,7 @@ class SaveFile: def __enter__(self): from .. import platform try: - truncate_and_unlink(self.tmppath) + safe_unlink(self.tmppath) except FileNotFoundError: pass self.fd = platform.SyncFile(self.tmppath, self.binary) @@ -178,7 +178,7 @@ class SaveFile: from .. import platform self.fd.close() if exc_type is not None: - truncate_and_unlink(self.tmppath) + safe_unlink(self.tmppath) return os.replace(self.tmppath, self.path) platform.sync_dir(os.path.dirname(self.path)) diff --git a/src/borg/remote.py b/src/borg/remote.py index 56ef54c26..c19531f3a 100644 --- a/src/borg/remote.py +++ b/src/borg/remote.py @@ -27,7 +27,7 @@ from .helpers import hostname_is_unique from .helpers import replace_placeholders from .helpers import sysinfo from .helpers import format_file_size -from .helpers import truncate_and_unlink +from .helpers import safe_unlink from .helpers import prepare_subprocess_env from .logger import create_logger, setup_logging from .helpers import msgpack @@ -1144,7 +1144,7 @@ class RepositoryCache(RepositoryNoCache): fd.write(packed) except OSError as os_error: try: - truncate_and_unlink(file) + safe_unlink(file) except FileNotFoundError: pass # open() could have failed as well if os_error.errno == errno.ENOSPC: diff --git a/src/borg/repository.py b/src/borg/repository.py index ca8faadfd..e5c09c3c5 100644 --- a/src/borg/repository.py +++ b/src/borg/repository.py @@ -19,7 +19,7 @@ from .helpers import Location from .helpers import ProgressIndicatorPercent from .helpers import bin_to_hex from .helpers import hostname_is_unique -from .helpers import secure_erase, truncate_and_unlink +from .helpers import secure_erase, safe_unlink from .helpers import msgpack from .locking import Lock, LockError, LockErrorT from .logger import create_logger @@ -1294,7 +1294,7 @@ class LoggedIO: if segment > transaction_id: if segment in self.fds: del self.fds[segment] - truncate_and_unlink(filename) + safe_unlink(filename) count += 1 else: break @@ -1402,7 +1402,7 @@ class LoggedIO: if segment in self.fds: del self.fds[segment] try: - truncate_and_unlink(self.segment_filename(segment)) + safe_unlink(self.segment_filename(segment)) except FileNotFoundError: pass