mirror of https://github.com/borgbackup/borg.git
Merge pull request #4669 from ThomasWaldmann/forward-ports-master
forward ports to master
This commit is contained in:
commit
76655b18d0
|
@ -872,7 +872,7 @@ This problem will go away as soon as the server has been upgraded to 1.0.7+.
|
|||
if self.dictFormat:
|
||||
self.to_send = msgpack.packb({MSGID: self.msgid, MSG: 'get', ARGS: args})
|
||||
else:
|
||||
self.to_send = msgpack.packb((1, self.msgid, 'get', self.named_to_positional(cmd, args)))
|
||||
self.to_send = msgpack.packb((1, self.msgid, 'get', self.named_to_positional('get', args)))
|
||||
|
||||
if self.to_send:
|
||||
try:
|
||||
|
|
|
@ -31,7 +31,7 @@ except ImportError:
|
|||
|
||||
try:
|
||||
from pytest import raises
|
||||
except ImportError:
|
||||
except: # noqa
|
||||
raises = None
|
||||
|
||||
has_lchflags = hasattr(os, 'lchflags') or sys.platform.startswith('linux')
|
||||
|
|
Loading…
Reference in New Issue