1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00

serve: fix incorrect type of exception_short for Errors

This commit is contained in:
Marian Beermann 2017-05-17 16:27:52 +02:00
parent 0ad210c47b
commit 9778c103ef

View file

@ -252,7 +252,7 @@ def serve(self):
ex_short = traceback.format_exception_only(e.__class__, e) ex_short = traceback.format_exception_only(e.__class__, e)
ex_full = traceback.format_exception(*sys.exc_info()) ex_full = traceback.format_exception(*sys.exc_info())
if isinstance(e, Error): if isinstance(e, Error):
ex_short = e.get_message() ex_short = [e.get_message()]
if isinstance(e, (Repository.DoesNotExist, Repository.AlreadyExists, PathNotAllowed)): if isinstance(e, (Repository.DoesNotExist, Repository.AlreadyExists, PathNotAllowed)):
# These exceptions are reconstructed on the client end in RemoteRepository.call_many(), # These exceptions are reconstructed on the client end in RemoteRepository.call_many(),
# and will be handled just like locally raised exceptions. Suppress the remote traceback # and will be handled just like locally raised exceptions. Suppress the remote traceback