Author: gnichols
Date: 2012-03-02 19:37:18 +0000 (Fri, 02 Mar 2012)
New Revision: 1211
Modified:
trunk/v7/redhatrelease.py
Log:
532557 - test suite should alarm operator and fail test runs on non GA kernel
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-03-02 19:36:19 UTC (rev 1210)
+++ trunk/v7/redhatrelease.py 2012-03-02 19:37:18 UTC (rev 1211)
@@ -100,14 +100,14 @@
self.kernelVersionRelease = match.group("versionRelease")
elif "Red Hat" in self.getProduct() and self.getVersion() >= 5:
- pattern =
re.compile("(?P<versionRelease>.*)(?P<product>el[0-9]+)(?P<flavor>xen|PAE|rt)?(?P<arch>.*)$")
+ pattern =
re.compile("(?P<versionRelease>.*)\.(?P<product>el[0-9]+)(?P<flavor>xen|PAE|rt)?(?P<arch>.*)$")
match = pattern.search(unameOutput)
if match:
flavor = ""
if match.group("flavor"):
self.kernelFlavor = match.group("flavor")
flavor = "%s-" % match.group("flavor")
- self.kernelRPMName = "kernel-%s%s%s" % (flavor,
match.group("versionRelease"), match.group("product"))
+ self.kernelRPMName = "kernel-%s%s.%s" % (flavor,
match.group("versionRelease"), match.group("product"))
self.kernelDevelRPMName = "kernel-%sdevel" % flavor
# RT kernel tags rt on the end of el5
if match.group("flavor") == "rt":
@@ -116,10 +116,10 @@
self.kernelVersionRelease = match.group("versionRelease")
elif 'Fedora' in self.getProduct():
- pattern =
re.compile("(?P<versionRelease>.*)(?P<product>fc[0-9]+)(?P<arch>.*)$")
+ pattern =
re.compile("(?P<versionRelease>.*)\.(?P<product>fc[0-9]+)(?P<arch>.*)$")
match = pattern.search(unameOutput)
if match:
- self.kernelRPMName = "kernel-%s%s%s" %
(match.group("versionRelease"), match.group("product"),
match.group("arch"))
+ self.kernelRPMName = "kernel-%s.%s%s" %
(match.group("versionRelease"), match.group("product"),
match.group("arch"))
self.kernelVersionRelease = match.group("versionRelease")
if not self.kernelRPMName:
@@ -178,6 +178,7 @@
print "Version: \"" + str(self.getVersion()) +
"\""
print "Update: \"" + str(self.getUpdate()) + "\""
print "Version.Update \"" + self.getVersionPointUpdate() +
"\""
+ print "Kernel Version \"" + self.getKernelVersionRelease() +
"\""
if self.candidate:
print "Candidate: \"" + self.getCandidate() +
"\""
print "Code Name: \"" + self.getCodeName() + "\""
Show replies by date