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

borg with-lock: catch exception, print error msg, fixes #8022

Browse source
This commit is contained in:
kmille 2024-01-07 00:02:43 +01:00 committed by Thomas Waldmann
parent 499e07d842
commit aae959cd6d
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/archiver.py
View file

@ -1806,6 +1806,8 @@ class Archiver:
# we exit with the return code we get from the subprocess
rc = subprocess.call([args.command] + args.args, env=env)
set_ec(rc)
except (FileNotFoundError, OSError, ValueError) as e:
raise CommandError(f"Error while trying to run '{args.command}': {e}")
finally:
# we need to commit the "no change" operation we did to the manifest
# because it created a new segment file in the repository. if we would

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

@ -3215,6 +3215,11 @@ class ArchiverTestCase(ArchiverTestCaseBase):
cmd = 'python3', '-c', 'import os, sys; sys.exit(42 if os.path.exists("%s") else 23)' % lock_path
self.cmd('with-lock', self.repository_location, *cmd, fork=True, exit_code=42)
def test_with_lock_non_existent_command(self):
self.cmd('init', '--encryption=repokey', self.repository_location)
cmd = ['non_existent_command', ]
self.cmd('with-lock', self.repository_location, *cmd, fork=True, exit_code=EXIT_ERROR)
def test_recreate_list_output(self):
self.cmd('init', '--encryption=repokey', self.repository_location)
self.create_regular_file('file1', size=0)