Handle errors from kmod.modprobe()

If a module fails to load it can throw KmodError. Catch this and convert
to RTSLibError.

Signed-off-by: Andy Grover <agrover@redhat.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/rtslib/utils.py b/rtslib/utils.py
index 79a4d9d..286dbc1 100644
--- a/rtslib/utils.py
+++ b/rtslib/utils.py
@@ -382,7 +382,6 @@ def modprobe(module):
 
     try:
         import kmod
-        kmod.Kmod().modprobe(module)
     except ImportError:
         process = subprocess.Popen(("modprobe", module),
                                    stdout=subprocess.PIPE,
@@ -390,6 +389,12 @@ def modprobe(module):
         (stdoutdata, stderrdata) = process.communicate()
         if process.returncode != 0:
             raise RTSLibError(stderrdata)
+        return
+
+    try:
+        kmod.Kmod().modprobe(module)
+    except kmod.error.KmodError:
+        raise RTSLibError("Could not load module: %s" % module)
 
 def mount_configfs():
     if not os.path.ismount("/sys/kernel/config"):