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

CLI: exit with rc=1 upon errors

Browse Source
This commit is contained in:
Brian Warner 2016-12-08 16:48:12 -08:00
parent 64307d3531
commit 58c7639635
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,17 +100,16 @@ def _dispatch_command(reactor, cfg, command):
try: try:
yield maybeDeferred(command) yield maybeDeferred(command)
except WrongPasswordError as e: except (WrongPasswordError, KeyFormatError) as e:
msg = fill("ERROR: " + dedent(e.__doc__)) msg = fill("ERROR: " + dedent(e.__doc__))
print(msg, file=stderr) print(msg, file=stderr)
raise SystemExit(1)
except WelcomeError as e: except WelcomeError as e:
msg = fill("ERROR: " + dedent(e.__doc__)) msg = fill("ERROR: " + dedent(e.__doc__))
print(msg, file=stderr) print(msg, file=stderr)
print(file=stderr) print(file=stderr)
print(str(e), file=stderr) print(str(e), file=stderr)
except KeyFormatError as e: raise SystemExit(1)
msg = fill("ERROR: " + dedent(e.__doc__))
print(msg, file=stderr)
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"