From bec02a36c8a35fa1c6cf194fcfc527a017713868 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 12 Nov 2023 18:35:25 +0100 Subject: [PATCH] use print_warning also in borg delete ::archive --force --force --- src/borg/archiver/delete_cmd.py | 9 ++++----- src/borg/testsuite/archiver/delete_cmd.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/borg/archiver/delete_cmd.py b/src/borg/archiver/delete_cmd.py index 9e2b4e8be..48cc59ddf 100644 --- a/src/borg/archiver/delete_cmd.py +++ b/src/borg/archiver/delete_cmd.py @@ -37,8 +37,7 @@ class DeleteMixIn: 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(f"Archive {archive_name} not found ({i}/{len(archive_names)}).") else: deleted = True if self.output_list: @@ -50,9 +49,9 @@ class DeleteMixIn: 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) @@ -73,7 +72,7 @@ class DeleteMixIn: 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.format(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/delete_cmd.py b/src/borg/testsuite/archiver/delete_cmd.py index 30727cac2..e5cc2d4e7 100644 --- a/src/borg/testsuite/archiver/delete_cmd.py +++ b/src/borg/testsuite/archiver/delete_cmd.py @@ -76,7 +76,7 @@ def test_delete_double_force(archivers, request): id = archive.metadata.items[0] repository.put(id, b"corrupted items metadata stream chunk") repository.commit(compact=False) - cmd(archiver, "delete", "-a", "test", "--force", "--force") + cmd(archiver, "delete", "-a", "test", "--force", "--force", exit_code=1) cmd(archiver, "check", "--repair") output = cmd(archiver, "rlist") assert "test" not in output