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

Merge pull request #2526 from enkore/issue/2513 

serve: fix incorrect type of exception_short for Errors
This commit is contained in:
enkore 2017-05-17 17:40:21 +02:00 committed by GitHub
parent 0ad210c47b 9778c103ef
commit eaf90cb73d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/borg/remote.py
View File

@ -252,7 +252,7 @@ class RepositoryServer: # pragma: no cover
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