diff --git a/src/borg/archiver/delete_cmd.py b/src/borg/archiver/delete_cmd.py index 00c3169c8..7095cda90 100644 --- a/src/borg/archiver/delete_cmd.py +++ b/src/borg/archiver/delete_cmd.py @@ -5,7 +5,7 @@ from ._common import with_repository, Highlander from ..archive import Archive, Statistics from ..cache import Cache from ..constants import * # NOQA -from ..helpers import log_multi, format_archive, sig_int +from ..helpers import log_multi, format_archive, sig_int, CommandError, Error from ..manifest import Manifest from ..logger import create_logger @@ -24,11 +24,10 @@ class DeleteMixIn: if not archive_names: return if args.match_archives is None and args.first == 0 and args.last == 0: - self.print_error( + raise CommandError( "Aborting: if you really want to delete all archives, please use -a 'sh:*' " "or just delete the whole repository (might be much faster)." ) - return if args.forced == 2: deleted = False diff --git a/src/borg/archiver/rcompress_cmd.py b/src/borg/archiver/rcompress_cmd.py index 3d5d358c6..30706dcd6 100644 --- a/src/borg/archiver/rcompress_cmd.py +++ b/src/borg/archiver/rcompress_cmd.py @@ -4,7 +4,7 @@ from collections import defaultdict from ._common import with_repository, Highlander from ..constants import * # NOQA from ..compress import CompressionSpec, ObfuscateSize, Auto, COMPRESSOR_TABLE -from ..helpers import sig_int, ProgressIndicatorPercent +from ..helpers import sig_int, ProgressIndicatorPercent, Error from ..manifest import Manifest @@ -150,7 +150,7 @@ class RCompressMixIn: pi.finish() if sig_int: # Ctrl-C / SIGINT: do not checkpoint (commit) again, we already have a checkpoint in this case. - self.print_error("Got Ctrl-C / SIGINT.") + raise Error("Got Ctrl-C / SIGINT.") elif uncommitted_chunks > 0: checkpoint_func() if args.stats: