mirror of
https://github.com/borgbackup/borg.git
synced 2025-02-20 21:27:32 +00:00
Merge pull request #3203 from ThomasWaldmann/fix-4args-open-1.1
fix server-side IndexError for 4-arg open() of old clients, fixes #3192
This commit is contained in:
commit
cb7a6252a3
1 changed files with 9 additions and 1 deletions
|
@ -180,7 +180,15 @@ def __init__(self, restrict_to_paths, restrict_to_repositories, append_only, sto
|
|||
|
||||
def positional_to_named(self, method, argv):
|
||||
"""Translate from positional protocol to named protocol."""
|
||||
return {name: argv[pos] for pos, name in enumerate(compatMap[method])}
|
||||
try:
|
||||
return {name: argv[pos] for pos, name in enumerate(compatMap[method])}
|
||||
except IndexError:
|
||||
if method == 'open' and len(argv) == 4:
|
||||
# borg clients < 1.0.7 use open() with 4 args
|
||||
mapping = compatMap[method][:4]
|
||||
else:
|
||||
raise
|
||||
return {name: argv[pos] for pos, name in enumerate(mapping)}
|
||||
|
||||
def filter_args(self, f, kwargs):
|
||||
"""Remove unknown named parameters from call, because client did (implicitly) say it's ok."""
|
||||
|
|
Loading…
Reference in a new issue