Attachment 578999 Details for Bug 812437 – info test patch to print error and handle errors finding the module file

[patch] info test patch to print error and handle errors finding the module file

info.patch (text/plain), 1.51 KB, created by Greg Nichols on 2012-04-20 13:05:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-04-20 13:05:06 UTC

Size: 1.51 KB

patch

obsolete

>Index: info.py
>===================================================================
>--- info.py	(revision 1269)
>+++ info.py	(working copy)
>@@ -292,6 +292,10 @@
>             module = line.split()[0]
>             moduleFile = self.getModuleFile(module)
>             
>+            if not moduleFile:
>+                success = False
>+                continue
>+            
>             # check that modules come from the kernel RPM.
>             if not moduleFile in kernelRPMModuleList:
>                 # RHEL4 does not include kmod
>@@ -320,6 +324,8 @@
>         warnVendorList = ["Fedora", "Fedora Project"]
>         try:
>             moduleFile = self.getModuleFile(module)
>+            if not moduleFile:
>+                return False
> 
>             vendor = Command("rpm -qf %s --qf %%{VENDOR}" % moduleFile).getString()
>             if vendor in goodVendorList:
>@@ -418,10 +424,16 @@
>                 if os.path.islink(moduleFile):
>                     moduleFile = os.readlink(moduleFile)
>                 return moduleFile
>+            else:
>+                print "Error: module source version mismatch: "
>+                print "   /sys/modules/%s/srcversion: %s" % (module, sysSrcVersion)
>+                print "   modinfo -F srcversion: %s" % modInfoSrcVersion
>+                
>         except V7CommandException, e:
>-            print "Error: could no find module file:"
>+            print "Error: could no find module file for %s:" % module
>             print e
>             e.command.printErrors()
>+            
>         return None
> 
>

Actions: View | Diff

Attachments on bug 812437: 578999