mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7231 from ThomasWaldmann/list-or-progress 

--list xor --progress
This commit is contained in:
TW 2022-12-29 00:39:53 +01:00 committed by GitHub
parent a50a7a608c c461fa8d0b
commit f5d6a8d051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/borg/archiver/__init__.py
View File

@ -383,7 +383,9 @@ class Archiver(
parser.common_options.resolve(args)
func = get_func(args)
if func == self.do_create and args.paths and args.paths_from_stdin:
parser.error("Must not pass PATH with ``--paths-from-stdin``.")
parser.error("Must not pass PATH with --paths-from-stdin.")
if args.progress and getattr(args, "output_list", False):
parser.error("Options --progress and --list do not play nicely together.")
if func == self.do_create and not args.paths:
if args.content_from_command or args.paths_from_command:
parser.error("No command given.")