fixup! Fixes #33176 - Improve tracer upload

Katello · Sep 6, 2021 · 23a2371 · 23a2371
1 parent 7f746ee
commit 23a2371
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/katello/tracer.py b/src/katello/tracer.py
@@ -1,29 +1,30 @@
 from __future__ import absolute_import
 from katello.uep import get_uep, lookup_consumer_id
 import sys
+import imp
 
 
 try:
-    import apt
+    imp.find_module('apt')
     from katello.apt_tracer import collect_apps
+    apt = True
 except ImportError as e:
-    apt = None
+    apt = False
 
 try:
-    import dnf
+    imp.find_module('dnf')
+    dnf = True
 except ImportError:
-    dnf = None
+    dnf = False
 
 try:
-    import yum
+    imp.find_module('yum')
+    yum = True
 except ImportError:
-    yum = None
+    yum = False
 
-try:
-    import zypp
-    from katello.zypper_tracer import collect_apps
-except ImportError:
-    zypp = None
+if yum or dnf:
+    from tracer.query import Query
 
 
 def upload_tracer_profile(queryfunc, plugin=None):