From 587c5161a3d09d1889ec65674351fdd96d2607a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 4 Nov 2016 10:21:45 +0100 Subject: [PATCH] mavlink_{shell,ulog_streaming}.py: show full error output when pymavlink import fails --- Tools/mavlink_shell.py | 3 ++- Tools/mavlink_ulog_streaming.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Tools/mavlink_shell.py b/Tools/mavlink_shell.py index 3a698762fe..a925bb6ba5 100755 --- a/Tools/mavlink_shell.py +++ b/Tools/mavlink_shell.py @@ -18,7 +18,8 @@ try: except: print("Failed to import pymavlink.") print("You may need to install it with 'pip install pymavlink pyserial'") - exit(-1) + print("") + raise from argparse import ArgumentParser diff --git a/Tools/mavlink_ulog_streaming.py b/Tools/mavlink_ulog_streaming.py index 3da8e14dce..f26c3d2ba7 100755 --- a/Tools/mavlink_ulog_streaming.py +++ b/Tools/mavlink_ulog_streaming.py @@ -17,8 +17,9 @@ try: from pymavlink import mavutil except: print("Failed to import pymavlink.") - print("You may need to install it with 'pip install pymavlink'") - exit(-1) + print("You may need to install it with 'pip install pymavlink pyserial'") + print("") + raise from argparse import ArgumentParser