Skip to content

Commit

Permalink
BackupError->BackupWarning, BackupOSError->BackupOSWarning
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomasWaldmann
ThomasWaldmann committed Nov 15, 2023
1 parent d55d842 commit d56c8ea
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 16 deletions.
35 changes: 21 additions & 14 deletions src/borg/archiver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
from .crypto.keymanager import KeyManager
from .helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR, EXIT_SIGNAL_BASE, classify_ec
from .helpers import Error, NoManifestError, CancelledByUser, RTError, CommandError, modern_ec, set_ec, get_ec
from .helpers import add_warning, BorgWarning, FileChangedWarning, BackupExcWarning, IncludePatternNeverMatchedWarning
from .helpers import add_warning, BorgWarning, FileChangedWarning, BackupWarning, BackupOSWarning, IncludePatternNeverMatchedWarning
from .helpers import positive_int_validator, location_validator, archivename_validator, ChunkerParams, Location
from .helpers import PrefixSpec, GlobSpec, CommentSpec, SortBySpec, FilesCacheMode
from .helpers import BaseFormatter, ItemFormatter, ArchiveFormatter
Expand Down Expand Up @@ -566,8 +566,11 @@ def create_inner(archive, cache, fso):
st = os_stat(path=path, parent_fd=None, name=None, follow_symlinks=False)
status = self._process_any(path=path, parent_fd=None, name=None, st=st, fso=fso,
cache=cache, read_special=args.read_special, dry_run=dry_run)
except (BackupOSError, BackupError) as e:
self.print_warning_instance(BackupExcWarning(path, e))
except BackupOSError as e:
self.print_warning_instance(BackupOSWarning(path, e))
status = 'E'
except BackupError as e:
self.print_warning_instance(BackupWarning(path, e))
status = 'E'
if status == 'C':
self.print_warning_instance(FileChangedWarning(path))
Expand All @@ -587,7 +590,7 @@ def create_inner(archive, cache, fso):
try:
status = fso.process_pipe(path=path, cache=cache, fd=sys.stdin.buffer, mode=mode, user=user, group=group)
except BackupOSError as e:
self.print_warning_instance(BackupExcWarning(path, e))
self.print_warning_instance(BackupOSWarning(path, e))
status = 'E'
else:
status = '-'
Expand All @@ -606,9 +609,9 @@ def create_inner(archive, cache, fso):
# if we get back here, we've finished recursing into <path>,
# we do not ever want to get back in there (even if path is given twice as recursion root)
skip_inodes.add((st.st_ino, st.st_dev))
except (BackupOSError, BackupError) as e:
except BackupOSError as e:
# this comes from os.stat, self._rec_walk has own exception handler
self.print_warning_instance(BackupExcWarning(path, e))
self.print_warning_instance(BackupOSWarning(path, e))
continue
if not dry_run:
if args.progress:
Expand Down Expand Up @@ -818,9 +821,11 @@ def _rec_walk(self, *, path, parent_fd, name, fso, cache, matcher,
exclude_caches=exclude_caches, exclude_if_present=exclude_if_present,
keep_exclude_tags=keep_exclude_tags, skip_inodes=skip_inodes, restrict_dev=restrict_dev,
read_special=read_special, dry_run=dry_run)

except (BackupOSError, BackupError) as e:
self.print_warning_instance(BackupExcWarning(path, e))
except BackupOSError as e:
self.print_warning_instance(BackupOSWarning(path, e))
status = 'E'
except BackupError as e:
self.print_warning_instance(BackupWarning(path, e))
status = 'E'
if status == 'C':
self.print_warning_instance(FileChangedWarning(path))
Expand Down Expand Up @@ -896,7 +901,7 @@ def peek_and_store_hardlink_masters(item, matched):
try:
archive.extract_item(dir_item, stdout=stdout)
except BackupOSError as e:
self.print_warning_instance(BackupExcWarning(remove_surrogates(dir_item.path), e))
self.print_warning_instance(BackupOSWarning(remove_surrogates(dir_item.path), e))
if output_list:
logging.getLogger('borg.output.list').info(remove_surrogates(item.path))
try:
Expand All @@ -909,9 +914,10 @@ def peek_and_store_hardlink_masters(item, matched):
else:
archive.extract_item(item, stdout=stdout, sparse=sparse, hardlink_masters=hardlink_masters,
stripped_components=strip_components, original_path=orig_path, pi=pi)
except (BackupOSError, BackupError) as e:
self.print_warning_instance(BackupExcWarning(remove_surrogates(orig_path), e))

except BackupOSError as e:
self.print_warning_instance(BackupOSWarning(remove_surrogates(orig_path), e))
except BackupError as e:
self.print_warning_instance(BackupWarning(remove_surrogates(orig_path), e))
if pi:
pi.finish()

Expand All @@ -924,7 +930,8 @@ def peek_and_store_hardlink_masters(item, matched):
try:
archive.extract_item(dir_item, stdout=stdout)
except BackupOSError as e:
self.print_warning_instance(BackupExcWarning(remove_surrogates(dir_item.path), e))
self.print_warning_instance(BackupOSWarning(remove_surrogates(dir_item.path), e))

for pattern in matcher.get_unmatched_include_patterns():
self.print_warning_instance(IncludePatternNeverMatchedWarning(pattern))
if pi:
Expand Down
7 changes: 5 additions & 2 deletions src/borg/helpers/errors.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,14 @@ class IncludePatternNeverMatchedWarning(BorgWarning):
exit_mcode = 101


class BackupExcWarning(BorgWarning):
class BackupWarning(BorgWarning):
"""{}: {}"""
exit_mcode = 102

# TODO: override exit_code and compute the exit code based on the wrapped exception.

class BackupOSWarning(BorgWarning):
"""{}: {}"""
exit_mcode = 104


class BackupError(Exception):
Expand Down

0 comments on commit d56c8ea

Please sign in to comment.