From 74954faec89d387603f8bec30db63ab7c0e4a0c0 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 12 Nov 2023 18:35:25 +0100
Subject: [PATCH] use print_warning also in borg delete ::archive --force
 --force

---
 src/borg/archiver.py           | 9 ++++-----
 src/borg/testsuite/archiver.py | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/borg/archiver.py b/src/borg/archiver.py
index b21c86b8c..ccc93f898 100644
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@@ -1201,8 +1201,7 @@ class Archiver:
                 try:
                     current_archive = manifest.archives.pop(archive_name)
                 except KeyError:
-                    self.exit_code = EXIT_WARNING
-                    logger.warning(f'Archive {archive_name} not found ({i}/{len(archive_names)}).')
+                    self.print_warning('Archive %s not found (%d/%d).', archive_name, i, len(archive_names))
                 else:
                     deleted = True
                     if self.output_list:
@@ -1215,9 +1214,9 @@ class Archiver:
                 manifest.write()
                 # note: might crash in compact() after committing the repo
                 repository.commit(compact=False)
-                logger.warning('Done. Run "borg check --repair" to clean up the mess.')
+                self.print_warning('Done. Run "borg check --repair" to clean up the mess.')
             else:
-                logger.warning('Aborted.')
+                self.print_warning('Aborted.')
             return self.exit_code
 
         stats = Statistics(iec=args.iec)
@@ -1237,7 +1236,7 @@ class Archiver:
                 try:
                     archive_info = manifest.archives[archive_name]
                 except KeyError:
-                    logger.warning(msg_not_found.format(archive_name, i, len(archive_names)))
+                    self.print_warning(msg_not_found, archive_name, i, len(archive_names))
                 else:
                     if self.output_list:
                         logger_list.info(msg_delete.format(format_archive(archive_info), i, len(archive_names)))
diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py
index cc3851af2..64068874a 100644
--- a/src/borg/testsuite/archiver.py
+++ b/src/borg/testsuite/archiver.py
@@ -1748,7 +1748,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             id = archive.metadata.items[0]
             repository.put(id, b'corrupted items metadata stream chunk')
             repository.commit(compact=False)
-        self.cmd('delete', '--force', '--force', self.repository_location + '::test')
+        self.cmd('delete', '--force', '--force', self.repository_location + '::test', exit_code=1)
         self.cmd('check', '--repair', self.repository_location)
         output = self.cmd('list', self.repository_location)
         self.assert_not_in('test', output)