mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-01 12:45:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8100 from ThomasWaldmann/fix-with-lock-exceptions-master

Browse source 
borg with-lock: catch exception, print error msg, fixes #8022
This commit is contained in:
TW 2024-02-18 14:07:37 +01:00 committed by GitHub
commit 74129e539b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/archiver/lock_cmds.py
View file

@ -4,7 +4,7 @@
from ._common import with_repository
from ..cache import Cache
from ..constants import * # NOQA
from ..helpers import prepare_subprocess_env, set_ec
from ..helpers import prepare_subprocess_env, set_ec, CommandError
from ..manifest import Manifest
from ..logger import create_logger
@ -35,6 +35,8 @@ def do_with_lock(self, args, repository):
# 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

7
src/borg/testsuite/archiver/lock_cmds.py
View file

@ -18,3 +18,10 @@ def test_with_lock(archivers, request):
lock_path = os.path.join(archiver.repository_path, "lock.exclusive")
command = "python3", "-c", 'import os, sys; sys.exit(42 if os.path.exists("%s") else 23)' % lock_path
cmd(archiver, "with-lock", *command, fork=True, exit_code=42)
def test_with_lock_non_existent_command(archivers, request):
archiver = request.getfixturevalue(archivers)
cmd(archiver, "rcreate", RK_ENCRYPTION)
command = ["non_existent_command"]
cmd(archiver, "with-lock", *command, fork=True, exit_code=EXIT_ERROR)