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

fix: Error/CommandError have a output format for 1 argument

Browse source
This commit is contained in:
Thomas Waldmann 2024-02-18 03:46:45 +01:00
parent d7e2e2cea9
commit ed28eb9e03
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/borg/archiver/create_cmd.py
View file

@ -80,15 +80,15 @@ def create_inner(archive, cache, fso):
preexec_fn=None if is_win32 else ignore_sigint,
)
except (FileNotFoundError, PermissionError) as e:
raise CommandError("Failed to execute command: %s", e)
raise CommandError(f"Failed to execute command: {e}")
status = fso.process_pipe(
path=path, cache=cache, fd=proc.stdout, mode=mode, user=user, group=group
)
rc = proc.wait()
if rc != 0:
raise CommandError("Command %r exited with status %d", args.paths[0], rc)
raise CommandError(f"Command {args.paths[0]!r} exited with status {rc}")
except BackupError as e:
raise Error("%s: %s", path, e)
raise Error(f"{path!r}: {e}")
else:
status = "+" # included
self.print_file_status(status, path)
@ -101,7 +101,7 @@ def create_inner(archive, cache, fso):
args.paths, stdout=subprocess.PIPE, env=env, preexec_fn=None if is_win32 else ignore_sigint
)
except (FileNotFoundError, PermissionError) as e:
raise CommandError("Failed to execute command: %s", e)
raise CommandError(f"Failed to execute command: {e}")
pipe_bin = proc.stdout
else: # args.paths_from_stdin == True
pipe_bin = sys.stdin.buffer
@ -132,7 +132,7 @@ def create_inner(archive, cache, fso):
if args.paths_from_command:
rc = proc.wait()
if rc != 0:
raise CommandError("Command %r exited with status %d", args.paths[0], rc)
raise CommandError(f"Command {args.paths[0]!r} exited with status {rc}")
else:
for path in args.paths:
if path == "": # issue #5637