Attachment 578400 Details for Bug 811247 – info test patch to check new location of whitelist.

[patch] info test patch to check new location of whitelist.

info.patch (text/plain), 1.58 KB, created by Greg Nichols on 2012-04-18 15:44:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-04-18 15:44:22 UTC

Size: 1.58 KB

patch

obsolete

>Index: info.py
>===================================================================
>--- info.py	(revision 1269)
>+++ info.py	(working copy)
>@@ -441,13 +441,19 @@
>         # skip abi checks for rt kernel
>         if self.redHatRelease.getKernelFlavor() == Constants.rt:
>             return True
>-        whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.redHatRelease.getKernel(), self.redHatRelease.getArch())
>+        whitelistLocations = [("/lib/modules/kabi-current/kabi_whitelist_" + self.redHatRelease.getArch()), # RHEL 6.3
>+                              ("/lib/modules/kabi/kabi_whitelist_" + self.redHatRelease.getArch()), # RHEL 6.2 ?
>+                              ("/usr/src/kernels/%s-%s/kabi_whitelist" % (self.redHatRelease.getKernel(), self.redHatRelease.getArch())) # ?
>+                            ]
>+        
>+        for whitelist in whitelistLocations:
>+            if os.path.exists(whitelist):
>+                break
>+           
>         if not os.path.exists(whitelist):
>-            usrSrcWhitelist = whitelist
>-            whitelist = "/lib/modules/kabi/kabi_whitelist_" + self.redHatRelease.getArch()
>-            if not os.path.exists(whitelist):
>-                print "Error: could not find whitelist file %s or %s" %(usrSrcWhitelist, whitelist)
>-                return False
>+            print "Error: could not find whitelist file in any of the following locations:"
>+            print "\n".join(whitelistLocations)
>+            return False
>     
>         print "Red Hat Enterprise Linux %u ABI" % self.redHatRelease.getVersion()
>         print "--------------------------------"

Actions: View | Diff

Attachments on bug 811247: 578400