upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-13 10:50:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

use print_warning also in borg delete ::archive --force --force

Browse source
This commit is contained in:
Thomas Waldmann 2023-11-12 18:35:25 +01:00
parent 62ad0369ef
commit 74954faec8
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/borg/archiver.py
View file

@ -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)))

2
src/borg/testsuite/archiver.py
View file

@ -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)