From: Andy Grover <agrover@redhat.com>
Date: Tue, 12 Feb 2013 00:55:11 +0000 (-0800)
Subject: python: Make kmod.modprobe() raise an error if no modules found
X-Git-Tag: v17~10^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4a57f6828fa25e57e81c31cd243e9aa8414a42c;p=thirdparty%2Fkmod.git

python: Make kmod.modprobe() raise an error if no modules found

Add 'quiet' option to override.

Add docstring.
---

diff --git a/libkmod/python/kmod/kmod.pyx b/libkmod/python/kmod/kmod.pyx
index 556b0f2b..3e73a1ca 100644
--- a/libkmod/python/kmod/kmod.pyx
+++ b/libkmod/python/kmod/kmod.pyx
@@ -102,8 +102,18 @@ cdef class Kmod (object):
         for mod in self.loaded():
             yield (mod.name, mod.size)
 
-    def modprobe(self, alias_name, *args, **kwargs):
-        for mod in self.lookup(alias_name=alias_name):
+    def modprobe(self, name, quiet=False, *args, **kwargs):
+        """
+        Load a module (or alias) and all modules on which it depends.
+        The 'quiet' option defaults to False; set to True to mimic the behavior
+        of the '--quiet' commandline option.
+        """
+        mods = list(self.lookup(alias_name=name))
+
+        if not mods and not quiet:
+            raise _KmodError('Could not modprobe %s' % name)
+
+        for mod in mods:
             mod.insert(*args, **kwargs)
 
     def rmmod(self, module_name, *args, **kwargs):