mirror of https://github.com/borgbackup/borg.git
Merge pull request #7231 from ThomasWaldmann/list-or-progress
--list xor --progress
This commit is contained in:
commit
f5d6a8d051
|
@ -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.")
|
||||
|
|
Loading…
Reference in New Issue