Attachment 585429 Details for Bug 817154 – info test patch on R26 fixing traceback, adding RT product info

[patch] info test patch on R26 fixing traceback, adding RT product info

info.patch (text/plain), 2.31 KB, created by Greg Nichols on 2012-05-18 14:33:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-05-18 14:33:38 UTC

Size: 2.31 KB

patch

obsolete

>Index: info.py
>===================================================================
>--- info.py	(revision 1310)
>+++ info.py	(working copy)
>@@ -194,22 +194,22 @@
>             if self.debug is not Constants.off:
>                 print "reading kernel info file " + kernelInfoFile
>             kernelInfo = KernelInfo(kernelInfoFile)
>-            RHELGAKernel = kernelInfo.getGAKernel(release.getVersion(), release.getUpdate())
>+            RHELGAKernel = kernelInfo.getGAKernel(release.getProduct(), release.getVersion(), release.getUpdate())
>             
>             if RHELGAKernel:
>-                if release.getKernelVersionRelease() == RHELGAKernel:
>-                    print "Kernel is RHEL %s.%s GA: %s" % (release.getVersion(), release.getUpdate(), RHELGAKernel)
>+                if self.redHatRelease.getKernelVersionRelease() == RHELGAKernel:
>+                    print "Kernel is %s %s.%s GA: %s" % (release.getProduct(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>                     return True
>                 # allow partial matches from the left-end of the V-R string
>                 try:
>-                    if release.getKernelVersionRelease().index(RHELGAKernel) is 0:
>-                        print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (release.getKernelVersionRelease(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>+                    if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
>+                        print "Warning: Kernel %s is a partial match %s %s.%s GA (%s)." % (self.redHatRelease.getKernelVersionRelease(), release.getProduct(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>                         return True
>                 except ValueError:
>                     # no match, fall through to error
>                     pass
>             # otherwise
>-            print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (release.getKernelVersionRelease(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>+            print "Error: Kernel is %s and not %s %s.%s GA (%s)" % (self.redHatRelease.getKernelVersionRelease(), release.getProduct(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>             return False
>         except IOError:
>             print "Error: could not open kernel info file " + kernelInfoFile

Actions: View | Diff

Attachments on bug 817154: 584960 | 584961 | 585400 | 585411 | 585428 | 585429 | 587401