浏览代码

delete: fix error handling when no archive is specified, fixes #8256

Thomas Waldmann 10 月之前
父节点
当前提交
10b38789d6
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      src/borg/archiver/delete_cmd.py

+ 2 - 3
src/borg/archiver/delete_cmd.py

@@ -5,7 +5,7 @@ from ._common import with_repository, Highlander
 from ..archive import Archive, Statistics
 from ..archive import Archive, Statistics
 from ..cache import Cache
 from ..cache import Cache
 from ..constants import *  # NOQA
 from ..constants import *  # NOQA
-from ..helpers import log_multi, format_archive, sig_int
+from ..helpers import log_multi, format_archive, sig_int, CommandError
 from ..manifest import Manifest
 from ..manifest import Manifest
 
 
 from ..logger import create_logger
 from ..logger import create_logger
@@ -24,11 +24,10 @@ class DeleteMixIn:
         if not archive_names:
         if not archive_names:
             return
             return
         if args.match_archives is None and args.first == 0 and args.last == 0:
         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:*' "
                 "Aborting: if you really want to delete all archives, please use -a 'sh:*' "
                 "or just delete the whole repository (might be much faster)."
                 "or just delete the whole repository (might be much faster)."
             )
             )
-            return
 
 
         if args.forced == 2:
         if args.forced == 2:
             deleted = False
             deleted = False