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

runner: display TransferErrors better

Browse Source 
These are known failures (like file-not-found, transfer rejected, etc).
Display the error message, but not a traceback.
This commit is contained in:
Brian Warner 2016-04-24 12:10:51 -07:00
parent 86edf96412
commit e8d3689a3a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ from __future__ import print_function
import os, sys import os, sys
from twisted.internet.defer import maybeDeferred from twisted.internet.defer import maybeDeferred
from twisted.internet.task import react from twisted.internet.task import react
from ..errors import TransferError
from ..timing import DebugTiming from ..timing import DebugTiming
from .cli_args import parser from .cli_args import parser
@ -41,6 +42,11 @@ def run(reactor, argv, cwd, stdout, stderr, executable=None):
timing.write(args.dump_timing, stderr) timing.write(args.dump_timing, stderr)
return res return res
d.addBoth(_maybe_dump_timing) d.addBoth(_maybe_dump_timing)
def _explain_error(f):
f.trap(TransferError)
print("ERROR:", f.value, file=stderr)
raise SystemExit(1)
d.addErrback(_explain_error)
def _rc(rc): def _rc(rc):
raise SystemExit(rc) raise SystemExit(rc)
d.addCallback(_rc) d.addCallback(_rc)