mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-08 04:44:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3193 from ThomasWaldmann/fix-4args-open

Browse source 
fix server-side IndexError for 4-arg open() of old clients, fixes #3192
This commit is contained in:
TW 2017-10-22 00:45:35 +02:00 • committed by GitHub
commit 152bb27663
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/borg/remote.py
View file

@ -179,7 +179,15 @@ class RepositoryServer: # pragma: no cover
def positional_to_named(self, method, argv): def positional_to_named(self, method, argv):
"""Translate from positional protocol to named protocol.""" """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): def filter_args(self, f, kwargs):
"""Remove unknown named parameters from call, because client did (implicitly) say it's ok.""" """Remove unknown named parameters from call, because client did (implicitly) say it's ok."""