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

be more helpful when parsing invalid --pattern values 

say what the real problem is.
say what is valid.

(cherry picked from commit f5ba0fc649)
This commit is contained in:
Thomas Waldmann 2018-03-03 03:08:20 +01:00
parent 1db42a58a5
commit 1e7c87b23d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/borg/patterns.py
View File

@ -367,17 +367,18 @@ def parse_inclexcl_command(cmd_line_str, fallback=ShellPattern):
'P': IECommand.PatternStyle,
'p': IECommand.PatternStyle,
}
if not cmd_line_str:
raise argparse.ArgumentTypeError("A pattern/command must not be empty.")
try:
cmd = cmd_prefix_map[cmd_line_str[0]]
cmd = cmd_prefix_map.get(cmd_line_str[0])
if cmd is None:
raise argparse.ArgumentTypeError("A pattern/command must start with any one of: %s" %
', '.join(cmd_prefix_map))
# remaining text on command-line following the command character
remainder_str = cmd_line_str[1:].lstrip()
if not remainder_str:
raise ValueError("Missing pattern/information!")
except (IndexError, KeyError, ValueError):
raise argparse.ArgumentTypeError("Unable to parse pattern/command: {}".format(cmd_line_str))
# remaining text on command-line following the command character
remainder_str = cmd_line_str[1:].lstrip()
if not remainder_str:
raise argparse.ArgumentTypeError("A pattern/command must have a value part.")
if cmd is IECommand.RootPath:
# TODO: validate string?