open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLI: don't emit traceback for TransferErrors

Browse Source 
But do print the message contained therein

refs #74
This commit is contained in:
Brian Warner 2016-12-08 16:49:44 -08:00
parent 58c7639635
commit ab972785aa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/cli/cli.py
View File

@ -8,7 +8,8 @@ from sys import stdout, stderr
from . import public_relay from . import public_relay
from .. import __version__ from .. import __version__
from ..timing import DebugTiming from ..timing import DebugTiming
from ..errors import WrongPasswordError, WelcomeError, KeyFormatError from ..errors import (WrongPasswordError, WelcomeError, KeyFormatError,
TransferError)
from twisted.internet.defer import inlineCallbacks, maybeDeferred from twisted.internet.defer import inlineCallbacks, maybeDeferred
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.internet.task import react from twisted.internet.task import react
@ -110,6 +111,9 @@ def _dispatch_command(reactor, cfg, command):
print(file=stderr) print(file=stderr)
print(str(e), file=stderr) print(str(e), file=stderr)
raise SystemExit(1) raise SystemExit(1)
except TransferError as e:
print("TransferError: %s" % str(e), file=stderr)
raise SystemExit(1)
except Exception as e: except Exception as e:
# this prints a proper traceback, whereas # this prints a proper traceback, whereas
# traceback.print_exc() just prints a TB to the "yield" # traceback.print_exc() just prints a TB to the "yield"