From 0a2b42b25ddc9630b51e59edbd7ad3444550cdcb Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Wed, 15 Jan 2020 09:58:09 +0100
Subject: [PATCH] msg/tools: improve Python dependency note

We now check individually for empy and genmsg.

Also, my recommendation is to use pip3 as a user to install the
dependencies as this is least intrusive and should work on all
platforms.
---
 msg/tools/px_generate_uorb_topic_files.py | 30 +++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/msg/tools/px_generate_uorb_topic_files.py b/msg/tools/px_generate_uorb_topic_files.py
index 2a1cf1c25c..707a5ff0e6 100755
--- a/msg/tools/px_generate_uorb_topic_files.py
+++ b/msg/tools/px_generate_uorb_topic_files.py
@@ -47,25 +47,29 @@ import errno
 
 try:
     import em
-    import genmsg.template_tools
 except ImportError as e:
-    print("python import error: ", e)
+    print("Python import error: ", e)
     print('''
-Required python packages not installed.
+Required python package empy not installed.
 
-On a Debian/Ubuntu system please run:
-
-  sudo apt-get install python3-empy
-  sudo pip3 install pyros-genmsg
-
-On MacOS please run:
-  sudo pip3 install empy pyros-genmsg
-
-On Windows please run:
-  easy_install empy pyros-genmsg
+Please run:
+    pip3 install --user empy
 ''')
     exit(1)
 
+try:
+    import genmsg.template_tools
+except ImportError as e:
+    print("Python import error: ", e)
+    print('''
+Required python package pyros-genmsg not installed.
+
+Please run:
+    pip3 install --user pyros-genmsg
+''')
+    exit(1)
+
+
 __author__ = "Sergey Belash, Thomas Gubler, Beat Kueng"
 __copyright__ = "Copyright (C) 2013-2016 PX4 Development Team."
 __license__ = "BSD"