From d392b3cfb6770cbed7507a552076ed1b3df5c880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jord=C3=A0=20Polo?= <jorda.polo@amd.com>
Date: Wed, 8 Jan 2025 11:38:59 -0800
Subject: [PATCH 1/2] Improve error message when loading load omnistat modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jordà Polo <jorda.polo@amd.com>
---
 omnistat-annotate   | 5 +++--
 omnistat-monitor    | 5 +++--
 omnistat-query      | 5 +++--
 omnistat-rms-env    | 5 +++--
 omnistat-standalone | 7 ++++---
 omnistat-usermode   | 5 +++--
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/omnistat-annotate b/omnistat-annotate
index 80a8815d..f9205b87 100755
--- a/omnistat-annotate
+++ b/omnistat-annotate
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.annotate import main
-except:
-    print("Unable to load omnistat.annotate. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-monitor b/omnistat-monitor
index 20fbd622..6aefda69 100755
--- a/omnistat-monitor
+++ b/omnistat-monitor
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.node_monitoring import main
-except:
-    print("Unable to load omnistat.node_monitoring. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-query b/omnistat-query
index 7f7207c5..8e615e43 100755
--- a/omnistat-query
+++ b/omnistat-query
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.query import main
-except:
-    print("Unable to load omnistat.query. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-rms-env b/omnistat-rms-env
index 3541c6eb..1ae9953a 100755
--- a/omnistat-rms-env
+++ b/omnistat-rms-env
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.rms_env import main
-except:
-    print("Unable to load omnistat.rms_env. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-standalone b/omnistat-standalone
index 1f5c3b4f..0a6283d9 100755
--- a/omnistat-standalone
+++ b/omnistat-standalone
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -------------------------------------------------------------------------------                                                                                                             # -------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 # MIT License
 #
 # Copyright (c) 2023 - 2025 Advanced Micro Devices, Inc. All Rights Reserved.
@@ -32,8 +32,9 @@ if os.path.isdir("omnistat") and sys.path[0]:
 
 try:
     from omnistat.standalone import main
-except:
-    print("Unable to load omnistat.standalone. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/omnistat-usermode b/omnistat-usermode
index f7c89f36..a0db786b 100755
--- a/omnistat-usermode
+++ b/omnistat-usermode
@@ -29,8 +29,9 @@ import sys
 
 try:
     from omnistat.omni_util import main
-except:
-    print("Unable to load omnistat.omni_util. Please verify installation.")
+except ImportError as err:
+    print(f"Unable to load Omnistat: {err}")
+    print("Please verify installation and dependencies.")
     sys.exit(1)
 
 if __name__ == "__main__":

From 6e73a58099619efba79bce4674b8e7c327e6548b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jord=C3=A0=20Polo?= <jorda.polo@amd.com>
Date: Wed, 8 Jan 2025 11:40:38 -0800
Subject: [PATCH 2/2] Remove unnecessary path insert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jordà Polo <jorda.polo@amd.com>
---
 omnistat-standalone | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/omnistat-standalone b/omnistat-standalone
index 0a6283d9..334b5e68 100755
--- a/omnistat-standalone
+++ b/omnistat-standalone
@@ -27,9 +27,6 @@
 import os
 import sys
 
-if os.path.isdir("omnistat") and sys.path[0]:
-    sys.path.insert(0, "")
-
 try:
     from omnistat.standalone import main
 except ImportError as err: